svn merge -c 1408473 FIXES: HADOOP-9021. Enforce configured SASL method on the server (daryn via bobby)