Crm 12160 -fix navigation upgrade errors