merge JIRA HADOOP-9332