svn merge -c 1583878 from trunk for HDFS-6167. Relocate the non-public API classes in the hdfs.client package.


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