Merge "Add contrail keystone endpoints"