HADOOP-7435