Update data-sources and events for 2.3.2
Merge branch 'master' into integration
Update Datasources for Symphony 2.5