svn merge -c 1427762 from branch-1 for HDFS-4337. Backport HDFS-4240: For nodegroup-aware block placement, when a node is excluded, the nodes in the same nodegroup should also be excluded.


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