temporary fix for group merging
refactor host groups, add UPS HTTP services, windows services, and correct admins