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