Firmed up some loose ends in the upgrade-test job configuration.