Comment 16 for bug 722201

One of the issues is being addressed upstream:

https://lists.samba.org/archive/samba-technical/2019-June/133694.html

So we can avoid merge diffs about this in the future (and I can refer upstream patch for this particular fix).