svn merge -c 1565505 merging from trunk to branch-2 to fix:HDFS-5807. TestBalancerWithNodeGroup.testBalancerWithNodeGroup fails intermittently.