Merge branch '7.x-2.x' into G26082-perms-followup
Fix an issue where access to the navbar was accidentally removed
Merge pull request #312 from previousnext/G26082-perms-followup

G26082 perms followup