HDFS-4658. Standby NN will log that it has received a block report "after becoming active". Contributed by Aaron T. Myers.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463644 13f79535-47bb-0310-9956-ffa450edef68
Merge -c 1463653 from trunk to branch-2 for YARN-382. SchedulerUtils improve way normalizeRequest sets the resource capabilities (Zhijie Shen via bikas)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463656 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1463698 Merging from trunk to branch-2 to fix HDFS-4649.

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