Issue #2156359 by DamienMcKenna: Follow-up to fix bugs when creating an entity bundle.