Revert temporary change of spack build caches after merging spack v1 updates to develop

[climbfuji]

Is your feature request related to a problem?

After feature/update_to_spack_v1 is merged into develop, we should revert the temporary changes of the spack build cache directories where applicable.

Describe the solution you'd like

GitHub actions, NRL sites, possibly others: revert the temporary changes of the spack build cache directories, overwrite old build cache directories with contents of temporary build cache directories.

Additional context

n/a