Merge "Add keystone v3 support"