update comment blocks
more comment fixes
comment cleanup & remove unused functions
fix static vs non static method in tests
Merge pull request #3133 from eileenmcnaughton/CRM-14367

Tidy ups & test fixes preparatory to fix