svn merge -c 1461597 Merging from trunk to branch-2 to fix HDFS-4581.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461602 13f79535-47bb-0310-9956-ffa450edef68
YARN-474. Revert since compilations fails: svn merge --change -1461403 .

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461626 13f79535-47bb-0310-9956-ffa450edef68
YARN-496. Fair scheduler configs are refreshed inconsistently in reinitialize. Contributed by Sandy Ryza

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461667 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-225-branch-2-gd