HDFS-5966. Fix rollback of rolling upgrade in NameNode HA setup.  Contributed by jing9


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1569885 13f79535-47bb-0310-9956-ffa450edef68