un-hardcode the farm name from the valve-infra container and fix vivian
Took longer than expected, but we should now have fewer reasons for having per-gateway infra containers \o/
Took longer than expected, but we should now have fewer reasons for having per-gateway infra containers \o/