apply HADOOP-9485

In our effort to catch back on the bug fixes done in Apache Hadoop we should apply https://issues.apache.org/jira/browse/HADOOP-9485