svn merge -c 1586079 from trunk for HDFS-6209. TestValidateConfigurationSettings should use random ports.


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