Fix some strict/deprecated warnings. Fixes #1613, #1614
Merge branch 'integration' of git://github.com/symphonycms/symphony-2 into integration