Merge "Fix the run-as environment to better match su."