Sasl/3.4

Backport SASL to 3.4