CRM-10466 - Ensure token hooks are always called
Merge pull request #2490 from colemanw/4.4

CRM-10466 - Ensure token hooks are always called