Issue #2760407 by Denchev, slashrsm, samuel.mortenson: Clean up EntityHelperTrait and covert it to a service.