HADOOP-9347: review feedback