[upstream] cyrus-sasl fixes update