improved re-run handling when original job had overlap; fixed bug in -b in shell script (VBAT-51, VBAT-70)