updating collection of usage events and the spring xml
Merge branch 'phils_rolly_polly_super_usage_refactor_branch' into five_minute_poller_refactor