svn merge -c 1582015 from trunk for HADOOP-10437. Fix the javac warnings in the conf and the util package.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582017 13f79535-47bb-0310-9956-ffa450edef68