Use "key-manager" for service type

Use "key-manager" as the service type for the Keystone catalog, as it is
a better description of the service, and is more in-line with with the
official program name "Key Management Service".

Change-Id: I1c76dc8e3817b790c9a082c50684af85a1107166

functionaltests/common/client.py

@@ -81,7 +81,7 @@ class BarbicanClient(object):
 
     def get_base_url(self, include_version=True):
         filters = {
-            'service': 'keystore',
+            'service': 'key-manager',
             'api_version': self.api_version if include_version else ''
         }