normalize the services for a post grizzly world

now that grizzly is gone, normalize the service list generation,
as anything that was getting set in stable/havana and master can
be set globally (cells).

restack the initial services list by major service so it's easier
to not miss something on future changes to that list.

Change-Id: Ib78d853fc99e71f1d0656e1ba047c84af786c08c