CFY-1046 add policy types/triggers and groups to deployment model