Resolves: rhbz#1054116 - Updated / de-fuzzified patches - Compiled with USE_LDAP_SASL if both "ldap" and "sasl" options are enabled. Resolves: rhbz#1052958