t208 - If CC fields are available, they're added as tokens - of not - the tokens are set to empty strings
Merge remote branch 'origin/7.x-3.0-qa' into 7.x-3.0-qa
t320 - Left over call to old D6 code