CON-1448 | Global nav on  editpage
Merge remote-tracking branch 'origin/CON-GlobalNav' into CON-1445