* Changed --user to --user_id and --role to --role_id in the keystone client for consistency. Need to update keystone calls here.
* Changed --user to --user_id and --role to --role_id in the keystone client for consistency. Need to update keystone calls here.