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


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