HDFS-4376. Fix race conditions in Balancer.  Contributed by Junping Du


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532932 13f79535-47bb-0310-9956-ffa450edef68
Move HDFS-5360 to 2.2.1 in CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532935 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5334. Implement dfshealth.jsp in HTML pages. Contributed by Haohui Mai.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532949 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd
Merge remote branch 'origin/trunk-gd' into fb-HDFS-4312-trunk-gd