MFC r303084: 6391 Override default SPA config location via environment

Note that there was a merge conflict because of an unmerged earlier
change.