[JBTM-1453] Make perf regression tests more configurable
[JBTM-1453] Fix merge error