SERVER-15493: changes to include cyrus-sasl-plain