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