Resolve #3611466 "Cleanup pipeline from"

Stephen Mustgraverequested to merge
issue/scanner-3611466:3611466-cleanup-pipeline-from into 2.0.x

Closes #3611466

Merge request reports