Merge "Fix docker-compose version check in tests"