Merge "SONAR TD - StatisticsContextImpl, StatisticsManagerImpl"