Attached are patches that backport the fix for #1324 to the sssd-1.5
branch.
Patches 1-4 are a dependency - I needed to backport the feature to only
resolve a single service once (upstream #1214). The fix for #1324 depends
on it both contextually and also users who are hit by #1324 will most
likely be hit by #1214, too.