Started working on adding the ability for EventQueues to emit metrics
Merge branch 'develop' into queuemetricfeature

Added fixes back from develop branch
Finished EventQueue feature. First updates for metric refactoring