(ITS#7118) [PATCH] Improve SASL plugin handling