CRM-15523 - Add sub-type custom fields to list of available tokens