Merge "change mechanism to report performance results" into jb-mr2-dev