DP-217 HDFS-4505 and HADOOP-3733 forward merge

See DP-205