Fix mixed up compute and compute extension links in menu

Also, re-sort menu to alphabetical sort of services

Change-Id: Ie0388fdcec69a9277e73734e6a49ba41e91e5f7f
author: diane fleming