Merge "Change openstack to use the jersey connector"