fix bug 850739 - put events map behind waffle
Merge pull request #927 from groovecoder/events-map-flag-850739

fix bug 850739 - put events map behind waffle