Merge change r1520650 from trunk: move HDFS-5118 to 2.1.1-beta section.

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