Issue #2806639 by joachim, naveenvalecha: remove dependency on deprecated core module entity_reference