CRM-14994 Fix activity type values
Merge pull request #3678 from kenwest/CRM-14994

CRM-14994 Fix activity type values