Conflicts: main/plugins/org.talend.core.runtime/src/main/java/org/talend/repository/ProjectManager.java