DS-2103: Reordering/Reorganizing of Administrative menu
Merge branch 'tdonohue-DS-2103'