Improve AnalyticsDataCollector reporting
Merge pull request #4785 from lucacopa/test_analytics

Improve AnalyticsDataCollector reporting