merge HADOOP-6350.7.patch