Rework the proxy steps, such that they are retried up to three times if needed

Karel van Klinkrequested to merge
feature/rework-pp-steps into develop

Also, remove a bunch of flake errors that we are not causing

Merge request reports