CRM-14052 - Revert workarounds for tokenInput.js and cleanup tagset code
Merge pull request #3890 from colemanw/CRM-14052

CRM-14052 - Revert workarounds for tokenInput.js and cleanup tagset code