YARN-557. Fix TestUnmanagedAMLauncher failure on Windows. Contributed by Chris Nauroth.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1465869 13f79535-47bb-0310-9956-ffa450edef68
YARN-524. Moving CHANGES.txt entry to the correct section.


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