Backport fixes for winbind for the latest additions.
Created attachment 12848 [details] patchset for 4.6
(In reply to Andreas Schneider from comment #1) Pushed to autobuild-v4-6-test.
(In reply to Karolin Seeger from comment #2) Pushed to v4-6-test. Closing out bug report. Thanks!