(cherry picked from commit 50386403)
(cherry picked from commit 6408b735)

Change-Id: I006c739a9dc876dd9ec83375f76fd1343b39557a
Reviewed-on: https://gerrit.libreoffice.org/20312Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>