Remove trove as default value for Service Name

* This causes service catalog lookup issues when the Catalog
  contains service_type = database, but service_name = somethine_else

fixes bug 1228372

Change-Id: I1f7eebb06d7f57c0ecc95d8c05104f43e803c406