refs #7654 alter how we limit administer navigation view
Merge branch 'dev' into test