Updated openstack/openstack
Project: openstack/python-keystoneclient  8c5d42ccc67a9db8ccc59b3f06bbe5c55f76ced2

remove useless part of error message

also did a bit of code cleanup for consistency

Change-Id: I48832c36e1a8b5a0029598dc74aaeaa3b3d2a66f