Add stats for individual event type count
Merge branch 'master' into pox_blackhole