Merge branch 'cleanup/test-1p-convergence' into 'master'

Timo Kochrequested to merge
cherry-pick-ab15a7a7 into releases/3.5

[test][1p][cleanup] Eliminate local static parameters

See merge request !3120 (merged)

(cherry picked from commit ab15a7a7)

84002bbf [test][1p] Eliminate local static parameters

Merge request reports