MAPREDUCE-5208. Bug-fix on branch-2 - tests weren't compiling.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482091 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1482121. Merging from trunk to branch-2 to fix HDFS-4805.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482122 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/branch-2' into branch-2-gd
Merge remote branch 'origin/branch-2-gd' into fb-HADOOP-9063-branch-2-gd