Aggregate and filter SASL client and server factories
Merge remote-tracking branch 'dmlloyd/sasl-factories'