TMDM-7465: Fixed imported objects are shown in conflict when reexporting them
Merge branch 'master' of https://github.com/Talend/tmdm-studio-se