Remove left over ElementCollection code.
Fix non initialized association proxy
Merge pull request #883 from FabioBatSilva/hotfix-slc

[DDC-2862] Fix non initialized association proxy