Port fixes from trunk (SASL fixes and mishandling of reply string buffer)