CRM-15680 fix custom data on survey & campaign