Issue #2752233 by rajeshwari10, Bambell: Replace the entity manager with the entity type manager in the code base