make the error message for [ticket:2889] more accurate, as we support
composites to many-to-ones now also
Merge branch 'master' into rel_0_9