Adds ability to override service name for service catalog

Instead of forcing the name of the service in the service catalog to
match auth_name, this allows the ability to explicitly set the service
name, separately from auth_name.

Change-Id: I142b9e944eacdeba8a029d7f15f067ef5f1f87a4
Merge "Adds ability to override service name for service catalog"