Merge "openstack credentials redefining"