Merge "[CVP,master] Fix cvp-perf job for xrally 0.11.2"