Update changes for HADOOP-9832.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1510796 13f79535-47bb-0310-9956-ffa450edef68