YARN-716. Fixed unit test failures - TestDistributedShell and TestUnmanagedAMLauncher. Contributed by Vinod Kumar Vavilapalli.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1485579 13f79535-47bb-0310-9956-ffa450edef68
Fixed incorrect jira in CHANGES.txt (YARN-716 to YARN-715)


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