Back-port this to allow merging a user registry fragment.

Conflicts:
	configmgr/source/components.cxx
	instsetoo_native/CustomTarget_setup.mk
	scp2/source/ooo/common_brand.scp

Conflicts:
	scp2/source/ooo/common_brand.scp

Change-Id: Ia32ba9ff3e7878d40032bd7d10fba2c143d11757
Reviewed-on: https://gerrit.libreoffice.org/17884Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>