Fix diff, conflict detection and merging of non-unique attributes

Non-unique multi-valued attributes had been completely ignored during
the conception of EMF Compare and thus every step of the process was
failing.

Change-Id: I09c7ff8cf3eee5fff6c76128a3142a29acb15987
61 files changed