Fix usage of timeoutScaleFactor in test-utils
Merge branch 'devel' into packaging