Fixup various pieces from 3431c1ee1be1bd33638ffe5ff2e340a692bed9dc prematurely merged to master with fewer adaptations. Change-Id: Ib4a430d6d7c32f662a4b3e4f056cea1b11b3ca74 Signed-off-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192012 Tested-by: Jenkins