HDFS-5612: updates in reaction to latest HDFS-5758 patch.