Merge "Update service client access in tempest tests"