UHM-1234: Move Manage Provider Schedules and Manage Service Types out of the System Administrator page and up to the top-level app
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'