Sort the modules alphabetically in the admin UI's configuration view
Merge pull request #3378 from simong/admin-ui-sorted

Sort the modules alphabetically in the admin UI's configuration view
Merge origin/master and fix conflicts