Merge "[SO] Fix so-openstack-adapter support for Keystone V3 api"