whitespace fixes
Merge pull request #618 from kurund/CRM-12463-fixes

whitespace fixes