Merge branch 'HDFS-4685' into HDFS-5612
HDFS-5612: updates in reaction to latest HDFS-5758 patch.
HDFS-5612: update comments.
HDFS-4685-WIP: merge HDFS-5612