HDFS-4381. Merge 1432149 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1432153 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'branch-2' of github.com:griddynamics/yhadoop-common into branch-2-gd