Change defaults for Service name + type

* Corresponds to change made in reddwarf-integration that changes
  the service name + type in keystone.

fixes bug# 1122515

Change-Id: I28a366662bfe9816a926708fc376afdf29f00de1
Merge "Change defaults for Service name + type"