Add upgrade_torture option to rakefile, plus some cleanup
Upgrade Torture step, first pass