Merge remote branch 'origin/trunk-gd' into fb-HADOOP-9078-trunk-gd

Conflicts:
	hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java
Merge branch 'fb-HADOOP-9078-trunk-gd' of https://github.com/griddynamics/yhadoop-common into fb-HADOOP-9078-trunk-gd