Revised to only use masterEnvVars from getExpandedLocation(AbstractBuild).
A user reported that $SVN_REVISION_1 etc. were not getting set otherwise.