Merge "Add more fields for keystone v3 auth"