Merge "tempest cleanup should use keystone v3 client"