[SSSD] [sssd PR#535][+Pushed] Backport of PR#525 and PR#534 to sssd-1-13