Merge "EnvironmentTest: make sure TMPDIR isn't set." into ics-mr0