Really fix Env this time
This cherry-picks the bits of !2 that relate to fixing the bugs that affect !Common in Env 1.40 and 1.41 without involving the bits that relate to the InstallTools script. This should enable them to be fast-tracked.
This cherry-picks the bits of !2 that relate to fixing the bugs that affect !Common in Env 1.40 and 1.41 without involving the bits that relate to the InstallTools script. This should enable them to be fast-tracked.