(cherry picked from commit eea3634b)

Conflicts:
	icu/UnpackedTarball_icu.mk

Change-Id: Ie31da5896d98908fd540146d1105ecc4257fa071
Reviewed-on: https://gerrit.libreoffice.org/2264Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>