dshub event cleanup

Merged Michael Tross requested to merge mtross/dss-mainline:dshub-event-cleanup into master Mar 16, 2017