Also require the bundle task for upgrade and upgrade_torture
Berks after bundle, and use the vendored berks