HDFS-5003. Merging change r1504356 from branch-1 to branch-1-win.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1-win@1504357 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5001. TestAzureBlockPlacementPolicy and TestReplicationPolicyWithNodeGroup failed caused by 1) old APIs and 2) incorrect value of depthOfAllLeaves. Contributed by Xi Fang.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1-win@1504365 13f79535-47bb-0310-9956-ffa450edef68