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

See DP-205

Conflicts:
	hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/PathData.java