svn merge -c 1471078 from branch-1 for HADOOP-9492. Update testConf.xml for HADOOP-9473.


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