Issue #3586259 by DamienMcKenna: Heavily refactored entity replacement logic...

Damien McKennarequested to merge
issue/scanner-3586259:3586259-refactor-replacement-logic into 2.0.x

Issue #3586259 by DamienMcKenna: Heavily refactored entity replacement logic to simplify field handling.

Closes #3586259

Merge request reports