svn merge -c 1612427 from trunk for HDFS-6680. BlockPlacementPolicyDefault does not choose favored nodes correctly.


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