REPORTS-220: Added definition, evaluator and converter
REPORTS-200: Added tests for evaluator and converter classes
Merge remote-tracking branch 'upstream/master' into REPORTS-220B
format fixes