merge -r 1440191:1440192 from trunk to branch-2 to fix HDFS-4288

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1440194 13f79535-47bb-0310-9956-ffa450edef68
merge HADOOP-9221 from trunk. Convert remaining xdocs to APT.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1440246 13f79535-47bb-0310-9956-ffa450edef68
Move HADOOP-9221 to correct section in CHANGES.txt.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1440247 13f79535-47bb-0310-9956-ffa450edef68