Initial work restoring 404 handling in Datasources and catching recursive 404's. RE: #1539
Handle when REDIRECTONEMPTY is set
Merge branch 'integration' of git://github.com/symphonycms/symphony-2 into integration