fb573c68235 from master needs to get into 4.9
Created attachment 14535 [details] Backport from master
Comment on attachment 14535 [details] Backport from master Applies cleanly to 4.9.next, 4.8.next.
Re-assigning to Karolin for inclusion in 4.9.next, 4.8.next.
(In reply to Jeremy Allison from comment #3) Pushed to both branches. Closing out bug report. Thanks!