(cherry picked from commit 63018dc73f4d29632e93be08d035ab9a7e73531c) Conflicts: hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CopyCommands.java (cherry picked from commit cbb3ba135cfa3a9bc9f444e8b4a7875758721a3c)
(cherry picked from commit 63018dc73f4d29632e93be08d035ab9a7e73531c) Conflicts: hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CopyCommands.java (cherry picked from commit cbb3ba135cfa3a9bc9f444e8b4a7875758721a3c)