fixing up cyrus-sasl conflicts