jh: refactor RichText Editor to be its own feature
diff --git a/features/org.eclipse.epf.base.feature.nls1/feature.xml b/features/org.eclipse.epf.base.feature.nls1/feature.xml
index 3ef4c5a..36f94f3 100644
--- a/features/org.eclipse.epf.base.feature.nls1/feature.xml
+++ b/features/org.eclipse.epf.base.feature.nls1/feature.xml
@@ -1,255 +1,247 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<feature

-      id="org.eclipse.epf.base.feature.nls1"

-      label="EPF Composer Base NLS1 Feature"

-      version="1.2.0.qualifier"

-      provider-name="Eclipse"

-      plugin="org.eclipse.epf.base">

-

-   <description>

-      %description

-   </description>

-

-   <copyright>

-      %copyright

-   </copyright>

-

-   <license url="%licenseURL">

-      %licenseText

-   </license>

-

-   <url>

-      <update label="%updateSiteName" url="http://download.eclipse.org/technology/epf/updates"/>

-   </url>

-

-   <plugin

-         id="org.eclipse.epf.authoring.ui.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.diagram.model.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.export.msp.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.export.msp.ui.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.export.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.export.xml.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.import.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.import.xml.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.library.edit.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.library.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"/>

-

-   <plugin

-         id="org.eclipse.epf.library.persistence.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.library.ui.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.library.ui.xmi.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.library.xmi.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.migration.diagram.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.publishing.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"/>

-

-   <plugin

-         id="org.eclipse.epf.publishing.ui.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.richtext.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.search.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.search.ui.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.ui.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.uma.edit.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.uma.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.validation.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.diagram.ad.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.diagram.add.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.diagram.edit.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.diagram.wpdd.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.diagram.core.nl1"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-</feature>

+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.epf.base.feature.nls1"
+      label="EPF Composer Base NLS1 Feature"
+      version="1.2.0.qualifier"
+      provider-name="Eclipse"
+      plugin="org.eclipse.epf.base">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %licenseText
+   </license>
+
+   <url>
+      <update label="%updateSiteName" url="http://download.eclipse.org/technology/epf/updates"/>
+   </url>
+
+   <plugin
+         id="org.eclipse.epf.authoring.ui.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.diagram.model.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.export.msp.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.export.msp.ui.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.export.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.export.xml.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.import.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.import.xml.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.library.edit.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.library.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.eclipse.epf.library.persistence.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.library.ui.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.library.ui.xmi.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.library.xmi.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.migration.diagram.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.publishing.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.eclipse.epf.publishing.ui.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.search.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.search.ui.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.ui.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.uma.edit.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.uma.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.validation.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.diagram.ad.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.diagram.add.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.diagram.edit.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.diagram.wpdd.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.diagram.core.nl1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.epf.base.feature.nls2/feature.xml b/features/org.eclipse.epf.base.feature.nls2/feature.xml
index 91359cf..f18c8a5 100644
--- a/features/org.eclipse.epf.base.feature.nls2/feature.xml
+++ b/features/org.eclipse.epf.base.feature.nls2/feature.xml
@@ -1,255 +1,247 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<feature

-      id="org.eclipse.epf.base.feature.nls2"

-      label="EPF Composer Base NLS2 Feature"

-      version="1.2.0.qualifier"

-      provider-name="Eclipse"

-      plugin="org.eclipse.epf.base">

-

-   <description>

-      %description

-   </description>

-

-   <copyright>

-      %copyright

-   </copyright>

-

-   <license url="%licenseURL">

-      %licenseText

-   </license>

-

-   <url>

-      <update label="%updateSiteName" url="http://download.eclipse.org/technology/epf/updates"/>

-   </url>

-

-   <plugin

-         id="org.eclipse.epf.authoring.ui.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.diagram.model.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.export.msp.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.export.msp.ui.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.export.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.export.xml.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.import.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.import.xml.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.library.edit.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.library.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"/>

-

-   <plugin

-         id="org.eclipse.epf.library.persistence.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.library.ui.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.library.ui.xmi.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.library.xmi.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.migration.diagram.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.publishing.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"/>

-

-   <plugin

-         id="org.eclipse.epf.publishing.ui.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.richtext.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.search.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.search.ui.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.ui.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.uma.edit.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.uma.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.validation.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.diagram.ad.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.diagram.add.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.diagram.edit.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.diagram.wpdd.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.diagram.core.nl2"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-</feature>

+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.epf.base.feature.nls2"
+      label="EPF Composer Base NLS2 Feature"
+      version="1.2.0.qualifier"
+      provider-name="Eclipse"
+      plugin="org.eclipse.epf.base">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %licenseText
+   </license>
+
+   <url>
+      <update label="%updateSiteName" url="http://download.eclipse.org/technology/epf/updates"/>
+   </url>
+
+   <plugin
+         id="org.eclipse.epf.authoring.ui.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.diagram.model.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.export.msp.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.export.msp.ui.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.export.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.export.xml.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.import.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.import.xml.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.library.edit.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.library.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.eclipse.epf.library.persistence.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.library.ui.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.library.ui.xmi.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.library.xmi.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.migration.diagram.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.publishing.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.eclipse.epf.publishing.ui.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.search.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.search.ui.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.ui.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.uma.edit.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.uma.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.validation.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.diagram.ad.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.diagram.add.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.diagram.edit.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.diagram.wpdd.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.diagram.core.nl2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.epf.base.feature.nls2a/feature.xml b/features/org.eclipse.epf.base.feature.nls2a/feature.xml
index 735f8c5..66b959d 100644
--- a/features/org.eclipse.epf.base.feature.nls2a/feature.xml
+++ b/features/org.eclipse.epf.base.feature.nls2a/feature.xml
@@ -1,255 +1,247 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<feature

-      id="org.eclipse.epf.base.feature.nls2a"

-      label="EPF Composer Base NLS2a Feature"

-      version="1.2.0.qualifier"

-      provider-name="Eclipse"

-      plugin="org.eclipse.epf.base">

-

-   <description>

-      %description

-   </description>

-

-   <copyright>

-      %copyright

-   </copyright>

-

-   <license url="%licenseURL">

-      %licenseText

-   </license>

-

-   <url>

-      <update label="%updateSiteName" url="http://download.eclipse.org/technology/epf/updates"/>

-   </url>

-

-   <plugin

-         id="org.eclipse.epf.authoring.ui.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.diagram.model.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.export.msp.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.export.msp.ui.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.export.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.export.xml.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.import.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.import.xml.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.library.edit.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.library.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"/>

-

-   <plugin

-         id="org.eclipse.epf.library.persistence.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.library.ui.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.library.ui.xmi.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.library.xmi.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.migration.diagram.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.publishing.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"/>

-

-   <plugin

-         id="org.eclipse.epf.publishing.ui.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.richtext.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.search.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.search.ui.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.ui.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.uma.edit.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.uma.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.validation.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.diagram.ad.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.diagram.add.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.diagram.edit.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.diagram.wpdd.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.epf.diagram.core.nl2a"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         fragment="true"

-         unpack="false"/>

-

-</feature>

+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.epf.base.feature.nls2a"
+      label="EPF Composer Base NLS2a Feature"
+      version="1.2.0.qualifier"
+      provider-name="Eclipse"
+      plugin="org.eclipse.epf.base">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %licenseText
+   </license>
+
+   <url>
+      <update label="%updateSiteName" url="http://download.eclipse.org/technology/epf/updates"/>
+   </url>
+
+   <plugin
+         id="org.eclipse.epf.authoring.ui.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.diagram.model.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.export.msp.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.export.msp.ui.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.export.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.export.xml.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.import.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.import.xml.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.library.edit.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.library.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.eclipse.epf.library.persistence.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.library.ui.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.library.ui.xmi.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.library.xmi.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.migration.diagram.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.publishing.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.eclipse.epf.publishing.ui.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.search.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.search.ui.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.ui.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.uma.edit.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.uma.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.validation.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.diagram.ad.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.diagram.add.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.diagram.edit.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.diagram.wpdd.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.epf.diagram.core.nl2a"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+</feature>