Issue #2923567 by Sam152, amateescu: Select from correct entity tables for...

Issue #2923567 by Sam152, amateescu: Select from correct entity tables for additional entity/field definitions when moving data to dedicated table storage from shared table storage for the purposes of purging