Do not use deployment name in hostgroup name

to remove the duplication from
"deploy-default/OS/OS: Controller (Neutron)"
reducing it to
"deploy-default/OS/Controller (Neutron)"