Merge "Fix Openstack with K8s and OpenContrail auth"