Merge "Add OS-INHERIT of keystone v3 in api tempest"