Be stricter when constructing queries throughout the core. RE: #2190
Merge branch 'integration' of github.com:symphonycms/symphony-2 into integration