CRM-12317 fix domain tokens
Merge pull request #367 from eileenmcnaughton/4.3

CRM-12317 fix domain tokens