Removing defunct *_for_event() methods
Adding service as a restriction type to base_report class
Merge remote branch 'origin/release' into develop