java.util.Collection subclasses used as import suggestions are not managed well

When an import suggestion of class X is defined, and X is a subclass of java.util.Collection the following issue was detected.

1) Asuming we added for example an import suggestion of class X that extends java.util.Collection

2) Then we open the data modeller and add a property e.g. theList of type X. (see attached file Screen1)

3) save the model in order to generate the pojos

4) open again the datamodeler. We we go to the pojo that have the property "theList" we will see it wrong. (see attached file Screen2)