Updating usage event processing and tests
Updating listeners for correct event processing for usage collection
Merge branch 'usage-refactor' into spring-autowire