Resolve #3294501 "Replace entitymanagerinterface with"

Ankit Pathakrequested to merge
issue/config_update-3294501:3294501-replace-entitymanagerinterface-with into 2.0.x

Closes #3294501

Merge request reports