Swap SASL and TLS header codes
Merge default into bug23749 (causing no changes)