lazy init fix on 361B report
deleted old cohort restricted data definitions
removed more dependencies on cohort
updated caching strategies
REPORTS-174 adjusted address format
REPORTS-200: Added tests for evaluator and converter classes
Merge remote-tracking branch 'upstream/master' into REPORTS-220B