YARN-2853. Merging to branch-2.6 for hadoop-2.6.0-rc1.
YARN-2635. Merging to branch-2.6 for hadoop-2.6.0-rc1.