Use new shared rax_to_dict and normalize the services key into something that makes sense

cloud/rax_identity

@@ -65,10 +65,8 @@ def cloud_identity(module, state, identity):
     )
     changed = False
 
-    for key, value in vars(identity).iteritems():
+    instance.update(rax_to_dict(identity))
-        if (isinstance(value, NON_CALLABLES) and
+    instance['services'] = instance.get('services', {}).keys()
-                not key.startswith('_')):
-            instance[key] = value
 
     if state == 'present':
         if not identity.authenticated: