HDFS-5986: minor cleanup