Update for Symphony 2.4 

Fixes symphonycms/symphony-2#2117
Merge branch 'master' into integration
Update Datasources for Symphony 2.5