HADOOP-9301. hadoop client servlet/jsp/jetty/tomcat JARs creating conflicts in Oozie & HttpFS. (tucu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1457000 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9408. misleading description for net.topology.table.file.name property in core-default.xml. Contributed by rajeshbabu.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1457015 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd
Merge remote branch 'origin/trunk-gd' into fb-YAHOO-163-trunk-gd