for addons menu merging

(cherry picked from commit 2aac0070)

Conflicts:
	framework/source/classes/menumanager.cxx
	framework/source/fwe/classes/addonmenu.cxx
	framework/source/uielement/menubarmanager.cxx
	include/framework/addonmenu.hxx

Change-Id: I3b606671db3a4c6ba8ed2b850e01e1ac91db7581