Missing files from the previous commit of HADOOP-11007