BZ-9494 fixed nav links
Merge remote-tracking branch 'refs/remotes/origin/master'