These are needed for the winbindd bugfixes in bugs #13231 ff.
Pushed to both 4-8-test, closing out bug report.