Issue #2850309 by mathieuhelie, rpayanm, heddn: Regenerate config entities when using --config-only multiple times