HDFS-4544. Merge 1453436 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1453444 13f79535-47bb-0310-9956-ffa450edef68
merge -c 1453501 from trunk to branch-2 to fix YARN-429. capacity-scheduler config missing from yarn-test artifact. Contributed by Siddharth Seth.

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