(cherry picked from commit e1a99802fc5c2f2ad3ceb000378db1c0133069b3) Conflicts: hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFs.java hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFsBaseTest.java