Issue #2424791 by jibran, dpi, chx, Berdir: Entity query hardcodes entity_reference and entity specifier