HDFS-4426. Merge change 1437627 from trunk.

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