Merge r1495162 from branch-2 to branch-2.1-beta for YARN-861. TestContainerManager is failing. Contributed by Vinod Kumar Vavilapalli.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1495164 13f79535-47bb-0310-9956-ffa450edef68