Reviewed-on: https://gerrit.libreoffice.org/17533Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit fff1d5bd)

Conflicts:
	external/libwps/ExternalPackage_libwps.mk
	external/libwps/UnpackedTarball_libwps.mk

Change-Id: I6661ff49e25921ce11dc04fffab84cf5db3c95fe
Reviewed-on: https://gerrit.libreoffice.org/17794Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>