Enforce keystone v2.0 usage

See https://review.openstack.org/#/c/24386/
and https://bugs.launchpad.net/nova/+bug/1154809
Merge pull request #12 from dirkmueller/master

Enforce keystone v2.0 usage