Fix NavigationMessages to match with messages in editor options
Merge branch 'integration/master' of github.com:zanata/zanata-server into integration/master