HDFS-6058. Fix TestHDFSCLI failures after HADOOP-8691 change. Contributed by Akira Ajisaka and Haohui Mai.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574792 13f79535-47bb-0310-9956-ffa450edef68