Merge -c 1228354 from trunk to branch-0.23 to fix MAPREDUCE-3624. Remove unnecessary dependency on JDK's tools.jar.