OGM-432 Making sure @ElementCollection are always stored within entity documents in CouchDB and MongoDB