Merge branch 'HDFS-4685' into HDFS-5608
Merge branch 'HDFS-5608' into HDFS-4685-WIP