Update Cyrus SASL detection to always look for <sasl.h> regardless

of version and then try -lsasl2 and -lsasl.  Make SASL code
conditional on SASL_VERSION_MAJOR, not HAVE_CYRUS_SASL.