Merge "Make sure services are running for test-setup.sh" into feature/zuulv3