Add service name to service catalog

This should have always been a part of the catalog but was overlooked in
implementation. Make sure it is correctly defined in the spec to prevent
it happening again.

Closes-Bug: #1288098
Change-Id: I4184ae663ea06ddef924f07b881759bcae211da8
Merge "Add service name to service catalog"