Merge "Add keystone API versioning support"