HDFS-6559: Merging r1603638 from trunk to branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603639 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-10711. Cleanup some extra dependencies from hadoop-auth. (rkanter via tucu)

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