Issue #2303079 by DamienMcKenna: Tidied up the entity bundle configuration variable.