Merge "Parametrize Salt master IPs in new stacks infra/config"