Merged revision(s) 1604692 from hadoop/common/trunk: HDFS-6507. Improve DFSAdmin to support HA cluster better. (Contributd by Zesheng Wu) ........