Support for keystone v3

Fixes: bug #1234215

Change-Id: I099495742602e9f56dd33a2690b29960d04552c9