Fix to follow (from master).
Created attachment 12592 [details] git-am fix for 4.5.next. Cherry-picked from master. Only needed for 4.5.x.
(In reply to Jeremy Allison from comment #2) Pushed to autobuild-v4-5-test.
(In reply to Karolin Seeger from comment #3) Pushed to v4-5-test. Closing out bug report. Thanks!