Refactor the way we replace entity storage handlers.

Andrei Mateescurequested to merge
issue/trash-3452414:3452414-refactor-storage-handling into 3.1.x

Closes #3452414

Merge request reports