making CalendarFeed subscriptions and Activiti User Task subscriptions work with the new domain model