Support matching by type in the service catalog

The type is specified by the OpenStack APIs, the name is for humans.

Code should be matching by type, not by name.
Merge branch 'match_service_by_type_not_name'