(cherry picked from commit d7ecac379a02876919d3e6081d42f0937f54e664) Conflicts: hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm
(cherry picked from commit d7ecac379a02876919d3e6081d42f0937f54e664) Conflicts: hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm