.
.
.
Merge remote-tracking branch 'upstream/master'
Merge pull request #269 from Rakeshadlagatta/master

Filters to event,chargecode,discounts etc
..
Merge remote-tracking branch 'upstream/master'
.
Merge remote-tracking branch 'upstream/master'
after fetch
Merge pull request #270 from Ranjith15/master

mapping config cleanup