Merge svn changes for issues #11728 and #11729. refs #11728, refs #11729
Remove old config key conceptsBaseUri from the application.ini.dist. refs #11728, refs #11729
Add missing logoff icon.
Update logoff icon path.
Update scripts version. refs #11728
Merge branch 'master' into 11728
solved conflict in public/assets/styles/editor.css