Refactor DeploymentRoleHostgroup and LayoutRole into a single join model