Merge "[CVP] Add method to fetch v3 or v2 keystone credentials"