Unstable jumbo: 2 benchmark-unify commits

to improve mapping --test output of 1.7.9-jumbo7 (and older versions) to --test output of unstable