HADOOP-9768: take 2 on correcting usage