Couple of assurance checks for Associations with empty relation/entry_id values. Fixes #1761
Merge branch 'integration' of git://github.com/symphonycms/symphony-2 into integration