Merge "Use tempest's ServiceClients rather than Manager"