CRM-12160 Fix domain on navigation inserts

Conflicts:

	CRM/Upgrade/Incremental/sql/4.2.3.mysql.tpl
	CRM/Upgrade/Incremental/sql/4.2.alpha1.mysql.tpl
CRM-12160 menu fixes for 4.3
Merge pull request #864 from eileenmcnaughton/CRM-12160

Crm 12160 -fix navigation upgrade errors