Merge "[SO] Enable use of Keystone v3"