[SSSD] Patches that need porting back to master