merge -c 1510774 FIXES: HADOOP-9816.  RPC Sasl QOP is broken (daryn)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1510783 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4905. Merging change r1510780 from branch-2 to branch-2.1-beta.

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