whitespace fixes
worked on CRM-12463, more fixes
Merge pull request #616 from kurund/CRM-12463-fixes

CRM-12463 fixes