Merge "Make update-from-keystone-admin-internal-api.yaml work on newton+"