(cherry picked from commit 9fbdb3d3)

Conflicts:
	cui/source/customize/cfg.cxx

Change-Id: I8955bee3ac2bb7a757c1f70dd46141833a068517
Reviewed-on: https://gerrit.libreoffice.org/19739Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit 13ef923c)