Crm 12528

This takes care of enabling full campaign integration in the files touched.