[SSSD] [PATCHES] Minor cleanups