(cherry picked from commit 3708fe84)

Conflicts:
	external/Module_external.mk
	scp2/Module_scp2.mk

Change-Id: I54bff2c8593995829857d30b38b8626a8c1a1a4f
Reviewed-on: https://gerrit.libreoffice.org/2252Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>