HADOOP-10970. Cleanup KMS configuration keys. (wang)
HDFS-7046. HA NN can NPE upon transition to active. Contributed by
Kihwal Lee.