Reapply "Refactored to use the base Entity::replace() method."

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

This reverts commit 6bb3b0bc.

Closes #3584659

Merge request reports