[v9_11] System test framework: cleanup tweaks

Merged Michał Kępień requested to merge 1452-system-test-framework-cleanup-tweaks-v9_11 into v9_11

Merge request reports