YARN-1120. Made ApplicationConstants.Environment.USER definition OS neutral as the corresponding value is now set correctly end-to-end. Contributed by Chuan Liu.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1519330 13f79535-47bb-0310-9956-ffa450edef68
YARN-1077. Fixed TestContainerLaunch test failure on Windows. Contributed by Chuan Liu.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1519333 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd
Merge remote branch 'origin/trunk-gd' into fb-YAHOO-288-trunk-gd