Fix bad conflict resolution

Addressing "stack level too deep" when creating a host group.
Automatic commit of package [foreman] minor release [1.1stable-28.4e7ea9b].