Corrected dependency injection in EntityAggregator
Merge branch 'gsoc-plugin' of https://github.com/karanpoddar/monitoring into gsoc-plugin