qa_crowbarsetup.sh Fix CI for upgrade handling once again

The last refactoring was apparently incomplete, fix fallout.