merge JIRA HADOOP-10528