BZ1068662 - Submenu entries are tied to admin role only (cherry-picked from 7fb670d5e8a98a269da10591a6b34c40168d7917)