HDFS-4369. Merging change 1433206 from trunk to branch-2

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433211 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9093. Merge 1433220 to branch-2

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433222 13f79535-47bb-0310-9956-ffa450edef68
Reverting the commit r1433222 to fix the commit message

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433223 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9203. Merge 1433220 to branch-2

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433225 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-4938. Merging change 1433227 from trunk to branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433230 13f79535-47bb-0310-9956-ffa450edef68
YARN-328. Merge r1433231 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433233 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4375. Merge 1433235 from trunk.

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