Merge "Update for Keystone v3"