Merge r1495160 from trunk to branch-2 for YARN-861. TestContainerManager is failing. Contributed by Vinod Kumar Vavilapalli.