whitespace and comments
Merge pull request #4127 from eileenmcnaughton/CRM-15299

whitespace and comments