Merge pull request #365 from eileenmcnaughton/4.3

whitespace line endings & incode documenation
CRM-12317 fix domain tokens