Patch [1] adjusted the default container names to contain dashes
rather than underscores. Inventories created prior to this patch
will still have container names with underscores, and these
are not handled correctly when making adjustments to env.d as the
"type_and_name" variable in the inventory generator will always
contain dashes in recent releases. This results in the legacy
container name never matching the new type_and_name, so components
added to, or moved between host groups in env.d will never be
assigned to those hosts.
[1] d74d038032
Change-Id: I20967f1b6e26977a64ec338780cc85006bc1f846
1590e39e19