Which effectively would be going to happen with
https://gerrit.libreoffice.org/49033 for 6-0 and
https://gerrit.libreoffice.org/55795 for 6-0-5
so have the same on master in case it would have unknown side
effects.

Change-Id: I312d7c5e723fb9417ac512641acb843ecd7a9867
Reviewed-on: https://gerrit.libreoffice.org/55811Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins