Merge from upstream including buildcache fix https://github.com/spack/spack/pull/46074 #698

Job	Run time
changes	4s
prechecks / validate	34s
prechecks / bootstrap-dev-rhel8	2m 52s
prechecks / style	1m 8s
prechecks / audit / package-audits (windows-latest, powershell Invoke-Expression -Command "./share/spack/qa/windows_t...	49s
prechecks / audit / package-audits (ubuntu-latest, bash)	1m 4s
prechecks / audit / package-audits (macos-latest, bash)	47s
all-prechecks	0s
unit-tests	0s
bootstrap	0s
all	0s
	7m 18s

Provide feedback