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