Dependency dupes

* fixed the failures from last time
* CAVEAT: all attributes types must be defined, otherwise Acceleo chokes and drops an 'invalid' string in the output
* https://76.230.139.159:8085/job/jon-remove-dependency-dupes/45/