HADOOP-10862. Miscellaneous trivial corrections to KMS classes. (asuresh via tucu) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt