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

See DP-205
Merge pull request #36 from VertiPub/aws-DP-207-HDFS-4505-HADOOP-3733-merge

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