Merge pull request #1660 from Kami/fix_openstack_auth

Fix OpenStack authentication regressions