Completed SASL canonicalization option patch