diff --git a/org.eclipse.mylyn.discovery-directory/.project b/org.eclipse.mylyn.discovery-directory/.project
deleted file mode 100644
index 3f1ca2e..0000000
--- a/org.eclipse.mylyn.discovery-directory/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.discovery-directory</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.mylyn.discovery-directory/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.discovery-directory/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index de87c3d..0000000
--- a/org.eclipse.mylyn.discovery-directory/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Thu May 28 21:40:06 PDT 2009
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.discovery-directory/META-INF/MANIFEST.MF b/org.eclipse.mylyn.discovery-directory/META-INF/MANIFEST.MF
deleted file mode 100644
index 1644881..0000000
--- a/org.eclipse.mylyn.discovery-directory/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.mylyn.discovery;singleton:=true
-Bundle-Version: 1.0.0.v20090623-0200
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.mylyn.discovery.core;bundle-version="1.0.0"
-Bundle-Localization: plugin
diff --git a/org.eclipse.mylyn.discovery-directory/about.html b/org.eclipse.mylyn.discovery-directory/about.html
deleted file mode 100644
index bc6e2b4..0000000
--- a/org.eclipse.mylyn.discovery-directory/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>July 3, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p>
-
-
-</body>
-</html>
diff --git a/org.eclipse.mylyn.discovery-directory/build.properties b/org.eclipse.mylyn.discovery-directory/build.properties
deleted file mode 100644
index c6eb316..0000000
--- a/org.eclipse.mylyn.discovery-directory/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Tasktop Technologies and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#      Tasktop Technologies - initial API and implementation
-###############################################################################
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               images/,\
-               plugin.properties
diff --git a/org.eclipse.mylyn.discovery-directory/images/bugzilla-screenshot-320x240.png b/org.eclipse.mylyn.discovery-directory/images/bugzilla-screenshot-320x240.png
deleted file mode 100644
index 74bc7aa..0000000
--- a/org.eclipse.mylyn.discovery-directory/images/bugzilla-screenshot-320x240.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.discovery-directory/images/bugzilla32.png b/org.eclipse.mylyn.discovery-directory/images/bugzilla32.png
deleted file mode 100644
index 0765486..0000000
--- a/org.eclipse.mylyn.discovery-directory/images/bugzilla32.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.discovery-directory/images/community-32.png b/org.eclipse.mylyn.discovery-directory/images/community-32.png
deleted file mode 100644
index 12ca900..0000000
--- a/org.eclipse.mylyn.discovery-directory/images/community-32.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.discovery-directory/images/community-48.png b/org.eclipse.mylyn.discovery-directory/images/community-48.png
deleted file mode 100644
index 1a2ee39..0000000
--- a/org.eclipse.mylyn.discovery-directory/images/community-48.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.discovery-directory/images/eclipse-32.png b/org.eclipse.mylyn.discovery-directory/images/eclipse-32.png
deleted file mode 100644
index 54d2fa2..0000000
--- a/org.eclipse.mylyn.discovery-directory/images/eclipse-32.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.discovery-directory/images/eclipse-48.png b/org.eclipse.mylyn.discovery-directory/images/eclipse-48.png
deleted file mode 100644
index b8a3906..0000000
--- a/org.eclipse.mylyn.discovery-directory/images/eclipse-48.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.discovery-directory/images/foglyn-128.png b/org.eclipse.mylyn.discovery-directory/images/foglyn-128.png
deleted file mode 100644
index f6e2817..0000000
--- a/org.eclipse.mylyn.discovery-directory/images/foglyn-128.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.discovery-directory/images/foglyn-32.png b/org.eclipse.mylyn.discovery-directory/images/foglyn-32.png
deleted file mode 100644
index c6dd4b2..0000000
--- a/org.eclipse.mylyn.discovery-directory/images/foglyn-32.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.discovery-directory/images/foglyn-48.png b/org.eclipse.mylyn.discovery-directory/images/foglyn-48.png
deleted file mode 100644
index 1e82682..0000000
--- a/org.eclipse.mylyn.discovery-directory/images/foglyn-48.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.discovery-directory/images/foglyn-64.png b/org.eclipse.mylyn.discovery-directory/images/foglyn-64.png
deleted file mode 100644
index 1ba4d6b..0000000
--- a/org.eclipse.mylyn.discovery-directory/images/foglyn-64.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.discovery-directory/images/foglyn-screenshot-320x240.png b/org.eclipse.mylyn.discovery-directory/images/foglyn-screenshot-320x240.png
deleted file mode 100644
index f642a1c..0000000
--- a/org.eclipse.mylyn.discovery-directory/images/foglyn-screenshot-320x240.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.discovery-directory/images/jira-screenshot-320x240.png b/org.eclipse.mylyn.discovery-directory/images/jira-screenshot-320x240.png
deleted file mode 100644
index 54781fe..0000000
--- a/org.eclipse.mylyn.discovery-directory/images/jira-screenshot-320x240.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.discovery-directory/images/jira32.png b/org.eclipse.mylyn.discovery-directory/images/jira32.png
deleted file mode 100644
index e681cf2..0000000
--- a/org.eclipse.mylyn.discovery-directory/images/jira32.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.discovery-directory/images/mantis-32.png b/org.eclipse.mylyn.discovery-directory/images/mantis-32.png
deleted file mode 100644
index f49d5eb..0000000
--- a/org.eclipse.mylyn.discovery-directory/images/mantis-32.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.discovery-directory/images/mantis-screenshot-320x240.png b/org.eclipse.mylyn.discovery-directory/images/mantis-screenshot-320x240.png
deleted file mode 100644
index fcfdc0e..0000000
--- a/org.eclipse.mylyn.discovery-directory/images/mantis-screenshot-320x240.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.discovery-directory/images/mylyn-48.png b/org.eclipse.mylyn.discovery-directory/images/mylyn-48.png
deleted file mode 100644
index ac4792f..0000000
--- a/org.eclipse.mylyn.discovery-directory/images/mylyn-48.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.discovery-directory/images/trac-screenshot-320x240.png b/org.eclipse.mylyn.discovery-directory/images/trac-screenshot-320x240.png
deleted file mode 100644
index 7081d03..0000000
--- a/org.eclipse.mylyn.discovery-directory/images/trac-screenshot-320x240.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.discovery-directory/images/trac32.png b/org.eclipse.mylyn.discovery-directory/images/trac32.png
deleted file mode 100644
index b10d993..0000000
--- a/org.eclipse.mylyn.discovery-directory/images/trac32.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.discovery-directory/images/trac64.png b/org.eclipse.mylyn.discovery-directory/images/trac64.png
deleted file mode 100644
index eb9bad6..0000000
--- a/org.eclipse.mylyn.discovery-directory/images/trac64.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.discovery-directory/plugin.properties b/org.eclipse.mylyn.discovery-directory/plugin.properties
deleted file mode 100644
index 8450462..0000000
--- a/org.eclipse.mylyn.discovery-directory/plugin.properties
+++ /dev/null
@@ -1,68 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Tasktop Technologies and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#      Tasktop Technologies - initial API and implementation
-###############################################################################
-#Properties file for org.eclipse.mylyn.discovery.site.categories
-Bundle-Name.0 = Mylyn Discovery Categories
-
-connectorCategory.name.eclipse = Eclipse.org
-connectorCategory.description.eclipse = Connectors hosted on Eclipse. Community supported via bugs.eclipse.org.
-
-connectorCategory.name.community = Community
-connectorCategory.description.community = Connectors provided by the Mylyn Community. Level of support may vary.
-
-connectorDescriptor.description.bugzilla = Integration for the open source Bugzilla bug tracking system.
-connectorDescriptor.provider.bugzilla = Eclipse Mylyn
-connectorDescriptor.license.bugzilla = Free, EPL
-connectorDescriptor.name.bugzilla = Mozilla Bugzilla
-connectorDescriptor.overview.summary.bugzilla = \
-Bugzilla is a free and open source system for managing bugs, software \
-projects and more. Key features include \
-advanced search, time tracking, reports and attachments.\n\
-\n\
-The Bugzilla Connector is the reference implementation for Mylyn connectors \
-and provides robust support for viewing and updating Bugzilla from Eclipse. \
-Key connector features include support for attachments, subtasks, custom \
-fields, change notifications, offline access and advanced query \
-capabilities.\n\
-\n\
-Supported Versions: 2.18 to 3.3.4.
-
-connectorDescriptor.description.trac = Integration for the open source Trac issue tracking system.
-connectorDescriptor.provider.trac = Eclipse Mylyn
-connectorDescriptor.license.trac = Free, EPL
-connectorDescriptor.name.trac = Edgewall Trac
-connectorDescriptor.overview.summary.trac = Trac is an enhanced wiki and issue tracking system for software development projects. Trac uses a minimalistic approach to web-based software project management. \n\
-\n\
-Our mission is to help developers write great software while staying out of the way. Trac should impose as little as possible on a team's established development process and policies.\n\
-\n\
-The Trac connector supports attachments and access through the web-interface and XML-RPC.\n\
-\n\
-Supported Versions: 0.9 to 0.11.
-
-connectorDescriptor.description.mantis = Integration for the open source Mantis bug tracker (Beta).
-connectorDescriptor.license.mantis = Free, EPL
-connectorDescriptor.name.mantis = Mantis
-connectorDescriptor.provider.mantis = Mylyn-Mantis
-connectorDescriptor.overview.summary.mantis = This project is an Eclipse Mylyn Repository plug-in for the Mantis Bug Tracking application using the Mantis Connect SOAP interface. This Repository Connector is beta quality. For the most part it works as advertised, it just needs testing and some refinements added. Should you need any help, use the forums to ask questions or the bug tracker to report problems.\n\
-\n\
-Supported Versions: 0.0.5 or 1.1.0a4 or greater.
-
-connectorDescriptor.description.foglyn = Integration for the FogBugz project management system.
-connectorDescriptor.license.foglyn = Commercial, 45 day trial
-connectorDescriptor.name.foglyn = Foglyn
-connectorDescriptor.provider.foglyn = www.foglyn.com
-connectorDescriptor.overview.summary.foglyn = Foglyn \u2013 FogBugz connector for Mylyn\n\
-\n\
-Foglyn allows you to list, view and edit your cases, attach new files or screenshots and resolve or reassign cases to somebody else.\n\
-\n\
-Foglyn works with FogBugz version 6 and FogBugz on Demand service.\n\
-\n\
-Foglyn is free during 45 days trial period. Free, standard and site licenses are available.
-
diff --git a/org.eclipse.mylyn.discovery-directory/plugin.xml b/org.eclipse.mylyn.discovery-directory/plugin.xml
deleted file mode 100644
index 27c0b7e..0000000
--- a/org.eclipse.mylyn.discovery-directory/plugin.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?><!--
-    Copyright (c) 2009 Tasktop Technologies and others.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-   
-    Contributors:
-         Tasktop Technologies - initial API and implementation
- -->
-
-<plugin>
-   <extension
-         point="org.eclipse.mylyn.discovery.core.connectorDiscovery">
-      <connectorCategory
-            description="%connectorCategory.description.eclipse"
-            id="org.eclipse.mylyn.discovery.site.categories.connectorCategoryEclipseOrg"
-            name="%connectorCategory.name.eclipse"
-            relevance="50">
-         <icon
-               image32="images/eclipse-32.png"
-               image48="images/eclipse-48.png"/>
-         <group
-               id="org.eclipse.mylyn.discovery-directory.bundled">
-         </group>
-         <group
-               id="org.eclipse.mylyn.discovery-directory.extra">
-         </group>
-      </connectorCategory>
-	  <connectorCategory
-         description="%connectorCategory.description.community"
-         id="org.eclipse.mylyn.discovery.directory.community"
-         name="%connectorCategory.name.community"
-         relevance="10">
-         <icon
-               image32="images/community-32.png"
-               image48="images/community-48.png">
-         </icon>
-      </connectorCategory>
-   </extension>
-   
-   <extension
-         point="org.eclipse.mylyn.discovery.core.connectorDiscovery">
-      <connectorDescriptor
-            categoryId="org.eclipse.mylyn.discovery.site.categories.connectorCategoryEclipseOrg"
-            description="%connectorDescriptor.description.bugzilla"
-            groupId="org.eclipse.mylyn.discovery-directory.bundled"
-            id="org.eclipse.mylyn.bugzilla_feature"
-            kind="task"
-            license="%connectorDescriptor.license.bugzilla"
-            name="%connectorDescriptor.name.bugzilla"
-            provider="%connectorDescriptor.provider.bugzilla"
-            siteUrl="http://download.eclipse.org/tools/mylyn/update/e3.4">
-         <icon
-               image32="images/bugzilla32.png">
-         </icon>
-         <overview
-               screenshot="images/bugzilla-screenshot-320x240.png"
-               summary="%connectorDescriptor.overview.summary.bugzilla"
-               url="http://eclipse.org/mylyn/">
-         </overview>
-      </connectorDescriptor>
-   
-      <connectorDescriptor
-            categoryId="org.eclipse.mylyn.discovery.site.categories.connectorCategoryEclipseOrg"
-            description="%connectorDescriptor.description.trac"
-            groupId="org.eclipse.mylyn.discovery-directory.extra"
-            id="org.eclipse.mylyn.trac_feature"
-            kind="task"
-            license="%connectorDescriptor.license.trac"
-            name="%connectorDescriptor.name.trac"
-            provider="%connectorDescriptor.provider.trac"
-            siteUrl="http://download.eclipse.org/tools/mylyn/update/extras">
-         <icon
-               image32="images/trac32.png"
-               image64="images/trac64.png">
-         </icon>
-         <overview
-               screenshot="images/trac-screenshot-320x240.png"
-               summary="%connectorDescriptor.overview.summary.trac"
-               url="http://eclipse.org/mylyn/">
-         </overview>
-      </connectorDescriptor>
-
-      <connectorDescriptor
-            categoryId="org.eclipse.mylyn.discovery.directory.community"
-            description="%connectorDescriptor.description.mantis"
-            id="com.itsolut.mantis_feature"
-            kind="task"
-            license="%connectorDescriptor.license.mantis"
-            name="%connectorDescriptor.name.mantis"
-            provider="%connectorDescriptor.provider.mantis"
-            siteUrl="http://mylyn-mantis.sourceforge.net/eclipse/update/">
-         <icon
-               image32="images/mantis-32.png"></icon>
-         <overview
-               screenshot="images/mantis-screenshot-320x240.png"
-               summary="%connectorDescriptor.overview.summary.mantis"
-               url="http://mylyn-mantis.wiki.sourceforge.net/">
-         </overview>
-      </connectorDescriptor>
-      
-      <connectorDescriptor
-            categoryId="org.eclipse.mylyn.discovery.directory.community"
-            description="%connectorDescriptor.description.foglyn"
-            id="com.foglyn"
-            kind="task"
-            license="%connectorDescriptor.license.foglyn"
-            name="%connectorDescriptor.name.foglyn"
-            provider="%connectorDescriptor.provider.foglyn"
-            siteUrl="http://update.foglyn.com/stable">
-         <icon
-               image128="images/foglyn-128.png"
-               image32="images/foglyn-32.png"
-               image48="images/foglyn-48.png"
-               image64="images/foglyn-64.png">
-         </icon>
-         <overview
-               screenshot="images/foglyn-screenshot-320x240.png"
-               summary="%connectorDescriptor.overview.summary.foglyn"
-               url="http://www.foglyn.com/?connectordiscovery">
-         </overview>
-      </connectorDescriptor>
-
-	<!--
-      <connectorDescriptor
-            categoryId="org.eclipse.mylyn.discovery.site.categories.connectorCategoryEclipseOrg"
-            description="The JIRA connector supports JIRA 3.4 or later."
-            id="org.eclipse.mylyn.jira_feature"
-            kind="task"
-            license="EPL"
-            name="Atlassian JIRA"
-            provider="Eclipse Mylyn"
-            siteUrl="http://download.eclipse.org/tools/mylyn/update/extras">
-         <icon
-               image32="images/jira32.png">
-         </icon>
-         <overview
-               screenshot="images/jira-screenshot-320x240.png"
-               summary="With the JIRA connector, you can query your JIRA server and access your issues from Eclipse. You can then quickly view and update your issues using a rich editor. When someone modifies one of your tasks, you&apos;ll see an incoming change notification in your task list. Now there&apos;s no need to use a web browser and email client to stay on top of your JIRA issues. Tasktop also provides task time tracking as well as personal, sophisticated scheduling for your JIRA tasks so you can prioritize your work beyond that available through JIRA."
-               url="http://confluence.atlassian.com/display/JIRAEXT/Mylyn">
-         </overview>
-      </connectorDescriptor>
-     -->
-
-	</extension>
-</plugin>
diff --git a/org.eclipse.mylyn.releng/maps/.cvsignore b/org.eclipse.mylyn.releng/maps/.cvsignore
deleted file mode 100644
index 15c29fe..0000000
--- a/org.eclipse.mylyn.releng/maps/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-orbit.map
diff --git a/org.eclipse.mylyn.releng/maps/common.map b/org.eclipse.mylyn.releng/maps/common.map
deleted file mode 100644
index 60b3734..0000000
--- a/org.eclipse.mylyn.releng/maps/common.map
+++ /dev/null
@@ -1,85 +0,0 @@
-!*******  FEATURES   ******** 
-;feature@org.eclipse.mylyn_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn-feature
-;feature@org.eclipse.mylyn.context_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context-feature
-;feature@org.eclipse.mylyn.bugzilla_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla-feature
-;feature@org.eclipse.mylyn.java_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java-feature
-;feature@org.eclipse.mylyn.team_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team-feature
-;feature@org.eclipse.mylyn.ide_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide-feature
-;feature@org.eclipse.mylyn.pde_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.pde-feature
-;feature@org.eclipse.mylyn.sdk_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.sdk-feature
-
-!******* EXTRAS ***********
-feature@org.eclipse.mylyn.trac_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac-feature
-feature@org.eclipse.mylyn.jira_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira-feature
-feature@org.eclipse.mylyn.web.tasks_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.web.tasks-feature
-feature@org.eclipse.mylyn.extras_sdk_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.extras-sdk-feature
-
-!******* INCUBATOR *******
-feature@org.eclipse.mylyn.monitor_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor-feature
-feature@org.eclipse.mylyn.xplanner_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner-feature
-feature@org.eclipse.mylyn.sandbox.ui_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.ui-feature
-feature@org.eclipse.mylyn.sandbox.dev_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.dev-feature
-feature@org.eclipse.mylyn.trac.wiki_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.trac.wiki-feature
-feature@org.eclipse.mylyn.experimental_sdk_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.experimental-sdk-feature
-
-!******* OTHER *******
-feature@org.eclipse.mylyn.test_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.test-feature
-
-
-!******* PLUGINS **********
-plugin@org.eclipse.mylyn=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn
-plugin@org.eclipse.mylyn.bugzilla.core=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core
-plugin@org.eclipse.mylyn.bugzilla.ide=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ide
-plugin@org.eclipse.mylyn.bugzilla.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui
-plugin@org.eclipse.mylyn.commons.core=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.core
-plugin@org.eclipse.mylyn.commons.net=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.net
-plugin@org.eclipse.mylyn.commons.soap=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.soap
-plugin@org.eclipse.mylyn.commons.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.ui
-plugin@org.eclipse.mylyn.compatibility=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.compatibility
-plugin@org.eclipse.mylyn.context.core=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context.core
-plugin@org.eclipse.mylyn.context.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context.ui
-;plugin@org.eclipse.mylyn.discovery.core=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.core
-;plugin@org.eclipse.mylyn.discovery.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.ui
-plugin@org.eclipse.mylyn.help.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.help.ui
-plugin@org.eclipse.mylyn.ide.ant=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.ant
-plugin@org.eclipse.mylyn.ide.capabilities=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.capabilities
-;plugin@org.eclipse.mylyn.ide.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.ui
-plugin@org.eclipse.mylyn.java.tasks=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java.tasks
-plugin@org.eclipse.mylyn.java.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java.ui
-plugin@org.eclipse.mylyn.jira.core=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira.core
-plugin@org.eclipse.mylyn.jira.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira.ui
-plugin@org.eclipse.mylyn.monitor.core=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.core
-plugin@org.eclipse.mylyn.monitor.reports=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.monitor.reports
-plugin@org.eclipse.mylyn.monitor.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.ui
-plugin@org.eclipse.mylyn.monitor.usage=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.usage
-;plugin@org.eclipse.mylyn.pde.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.pde.ui
-plugin@org.eclipse.mylyn.resources.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.resources.ui
-plugin@org.eclipse.mylyn.sandbox.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.ui
-plugin@org.eclipse.mylyn.sandbox.dev=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.dev
-;plugin@org.eclipse.mylyn.tasks.bugs=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.bugs
-;plugin@org.eclipse.mylyn.tasks.core=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.core
-plugin@org.eclipse.mylyn.tasks.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui
-plugin@org.eclipse.mylyn.team.cvs=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team.cvs
-plugin@org.eclipse.mylyn.team.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team.ui
-plugin@org.eclipse.mylyn.trac.core=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac.core
-plugin@org.eclipse.mylyn.trac.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac.ui
-plugin@org.eclipse.mylyn.trac.wiki=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.trac.wiki
-plugin@org.eclipse.mylyn.web.tasks=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.web.tasks
-plugin@org.eclipse.mylyn.xplanner.core=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner.core
-plugin@org.eclipse.mylyn.xplanner.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner.ui
-
-plugin@org.eclipse.mylyn.tests=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tests
-plugin@org.eclipse.mylyn.bugzilla.tests=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.tests
-plugin@org.eclipse.mylyn.commons.tests=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.tests
-plugin@org.eclipse.mylyn.context.tests=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context.tests
-;plugin@org.eclipse.mylyn.discovery.tests=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.tests
-plugin@org.eclipse.mylyn.ide.tests=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.tests
-plugin@org.eclipse.mylyn.java.tests=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java.tests
-plugin@org.eclipse.mylyn.jira.tests=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira.tests
-plugin@org.eclipse.mylyn.monitor.tests=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.tests
-plugin@org.eclipse.mylyn.resources.tests=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.resources.tests
-plugin@org.eclipse.mylyn.sandbox.tests=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.tests
-plugin@org.eclipse.mylyn.tasks.tests=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.tests
-plugin@org.eclipse.mylyn.team.tests=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team.tests
-plugin@org.eclipse.mylyn.trac.tests=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac.tests
-plugin@org.eclipse.mylyn.xplanner.tests=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner.tests
diff --git a/org.eclipse.mylyn.releng/maps/mylyn_e3.3.map b/org.eclipse.mylyn.releng/maps/mylyn_e3.3.map
index 9f06927..4828b44 100644
--- a/org.eclipse.mylyn.releng/maps/mylyn_e3.3.map
+++ b/org.eclipse.mylyn.releng/maps/mylyn_e3.3.map
@@ -1,17 +1,101 @@
-feature@org.eclipse.mylyn_feature=e_3_3_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn-feature
-feature@org.eclipse.mylyn.context_feature=e_3_3_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context-feature
-feature@org.eclipse.mylyn.bugzilla_feature=e_3_3_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla-feature
-feature@org.eclipse.mylyn.java_feature=e_3_3_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java-feature
-feature@org.eclipse.mylyn.team_feature=e_3_3_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team-feature
-feature@org.eclipse.mylyn.ide_feature=e_3_3_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide-feature
-feature@org.eclipse.mylyn.pde_feature=e_3_3_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.pde-feature
-feature@org.eclipse.mylyn.sdk_feature=e_3_3_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.sdk-feature
-feature@org.eclipse.mylyn.wikitext_feature=R_3_2_2_e_3_3,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext-feature
+!*******  FEATURES   ******** 
+feature@org.eclipse.mylyn_feature=e_3_3_m_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn-feature
+feature@org.eclipse.mylyn.context_feature=e_3_3_m_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context-feature
+feature@org.eclipse.mylyn.bugzilla_feature=e_3_3_m_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla-feature
+feature@org.eclipse.mylyn.java_feature=e_3_3_m_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java-feature
+feature@org.eclipse.mylyn.team_feature=e_3_3_m_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team-feature
+feature@org.eclipse.mylyn.ide_feature=e_3_3_m_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide-feature
+feature@org.eclipse.mylyn.pde_feature=e_3_3_m_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.pde-feature
+feature@org.eclipse.mylyn.sdk_feature=e_3_3_m_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.sdk-feature
+feature@org.eclipse.mylyn.wikitext_feature=e_3_3_m_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext-feature
 
-plugin@org.eclipse.mylyn.ide.ui=e_3_3_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.ui
-plugin@org.eclipse.mylyn.pde.ui=e_3_3_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.pde.ui
-plugin@org.eclipse.mylyn.tasks.bugs=e_3_3_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.bugs
-plugin@org.eclipse.mylyn.tasks.core=e_3_3_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.core
+!******* EXTRAS ***********
+feature@org.eclipse.mylyn.trac_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac-feature
+feature@org.eclipse.mylyn.jira_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira-feature
+feature@org.eclipse.mylyn.web.tasks_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.web.tasks-feature
+feature@org.eclipse.mylyn.extras_sdk_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.extras-sdk-feature
 
-plugin@org.eclipse.mylyn.discovery.tests=e_3_3_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.tests
+!******* INCUBATOR *******
+feature@org.eclipse.mylyn.monitor_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor-feature
+feature@org.eclipse.mylyn.xplanner_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner-feature
+feature@org.eclipse.mylyn.sandbox.ui_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.ui-feature
+feature@org.eclipse.mylyn.sandbox.dev_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.dev-feature
+feature@org.eclipse.mylyn.trac.wiki_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.trac.wiki-feature
+feature@org.eclipse.mylyn.experimental_sdk_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.experimental-sdk-feature
 
+!******* OTHER *******
+feature@org.eclipse.mylyn.test_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.test-feature
+
+
+!******* PLUGINS **********
+plugin@org.eclipse.mylyn=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn
+plugin@org.eclipse.mylyn.bugzilla.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core
+plugin@org.eclipse.mylyn.bugzilla.ide=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ide
+plugin@org.eclipse.mylyn.bugzilla.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui
+plugin@org.eclipse.mylyn.commons.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.core
+plugin@org.eclipse.mylyn.commons.net=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.net
+plugin@org.eclipse.mylyn.commons.soap=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.soap
+plugin@org.eclipse.mylyn.commons.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.ui
+plugin@org.eclipse.mylyn.compatibility=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.compatibility
+plugin@org.eclipse.mylyn.context.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context.core
+plugin@org.eclipse.mylyn.context.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context.ui
+plugin@org.eclipse.mylyn.help.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.help.ui
+plugin@org.eclipse.mylyn.ide.ant=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.ant
+plugin@org.eclipse.mylyn.ide.capabilities=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.capabilities
+plugin@org.eclipse.mylyn.ide.ui=e_3_3_m_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.ui
+plugin@org.eclipse.mylyn.java.tasks=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java.tasks
+plugin@org.eclipse.mylyn.java.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java.ui
+plugin@org.eclipse.mylyn.jira.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira.core
+plugin@org.eclipse.mylyn.jira.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira.ui
+plugin@org.eclipse.mylyn.monitor.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.core
+plugin@org.eclipse.mylyn.monitor.reports=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.monitor.reports
+plugin@org.eclipse.mylyn.monitor.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.ui
+plugin@org.eclipse.mylyn.monitor.usage=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.usage
+plugin@org.eclipse.mylyn.pde.ui=e_3_3_m_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.pde.ui
+plugin@org.eclipse.mylyn.resources.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.resources.ui
+plugin@org.eclipse.mylyn.sandbox.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.ui
+plugin@org.eclipse.mylyn.sandbox.dev=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.dev
+plugin@org.eclipse.mylyn.tasks.bugs=e_3_3_m_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.bugs
+plugin@org.eclipse.mylyn.tasks.core=e_3_3_m_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.core
+plugin@org.eclipse.mylyn.tasks.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui
+plugin@org.eclipse.mylyn.team.cvs=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team.cvs
+plugin@org.eclipse.mylyn.team.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team.ui
+plugin@org.eclipse.mylyn.trac.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac.core
+plugin@org.eclipse.mylyn.trac.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac.ui
+plugin@org.eclipse.mylyn.trac.wiki=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.trac.wiki
+plugin@org.eclipse.mylyn.web.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.web.ui
+plugin@org.eclipse.mylyn.web.tasks=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.web.tasks
+plugin@org.eclipse.mylyn.wikitext.confluence.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.confluence.core
+plugin@org.eclipse.mylyn.wikitext.confluence.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.confluence.ui
+plugin@org.eclipse.mylyn.wikitext.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.core
+plugin@org.eclipse.mylyn.wikitext.help.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.help.ui
+plugin@org.eclipse.mylyn.wikitext.help.sdk=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.help.sdk
+plugin@org.eclipse.mylyn.wikitext.mediawiki.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.mediawiki.core
+plugin@org.eclipse.mylyn.wikitext.mediawiki.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.mediawiki.ui
+plugin@org.eclipse.mylyn.wikitext.tasks.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tasks.ui
+plugin@org.eclipse.mylyn.wikitext.textile.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.textile.core
+plugin@org.eclipse.mylyn.wikitext.textile.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.textile.ui
+plugin@org.eclipse.mylyn.wikitext.tracwiki.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tracwiki.core
+plugin@org.eclipse.mylyn.wikitext.tracwiki.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tracwiki.ui
+plugin@org.eclipse.mylyn.wikitext.twiki.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.twiki.core
+plugin@org.eclipse.mylyn.wikitext.twiki.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.twiki.ui
+plugin@org.eclipse.mylyn.wikitext.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.ui
+plugin@org.eclipse.mylyn.xplanner.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner.core
+plugin@org.eclipse.mylyn.xplanner.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner.ui
+
+plugin@org.eclipse.mylyn.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tests
+plugin@org.eclipse.mylyn.bugzilla.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.tests
+plugin@org.eclipse.mylyn.commons.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.tests
+plugin@org.eclipse.mylyn.context.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context.tests
+plugin@org.eclipse.mylyn.discovery.tests=e_3_3_m_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.tests
+plugin@org.eclipse.mylyn.ide.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.tests
+plugin@org.eclipse.mylyn.java.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java.tests
+plugin@org.eclipse.mylyn.jira.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira.tests
+plugin@org.eclipse.mylyn.monitor.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.tests
+plugin@org.eclipse.mylyn.resources.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.resources.tests
+plugin@org.eclipse.mylyn.sandbox.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.tests
+plugin@org.eclipse.mylyn.tasks.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.tests
+plugin@org.eclipse.mylyn.team.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team.tests
+plugin@org.eclipse.mylyn.trac.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac.tests
+plugin@org.eclipse.mylyn.wikitext.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tests
+plugin@org.eclipse.mylyn.xplanner.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner.tests
diff --git a/org.eclipse.mylyn.releng/maps/mylyn_e3.4.map b/org.eclipse.mylyn.releng/maps/mylyn_e3.4.map
index 734bb35..6ce2b7c 100644
--- a/org.eclipse.mylyn.releng/maps/mylyn_e3.4.map
+++ b/org.eclipse.mylyn.releng/maps/mylyn_e3.4.map
@@ -1,19 +1,110 @@
-feature@org.eclipse.mylyn_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn-feature
-feature@org.eclipse.mylyn.context_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context-feature
-feature@org.eclipse.mylyn.bugzilla_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla-feature
-feature@org.eclipse.mylyn.java_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java-feature
-feature@org.eclipse.mylyn.team_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team-feature
-feature@org.eclipse.mylyn.ide_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide-feature
-feature@org.eclipse.mylyn.pde_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.pde-feature
-feature@org.eclipse.mylyn.sdk_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.sdk-feature
-feature@org.eclipse.mylyn.wikitext_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext-feature
-feature@org.eclipse.mylyn.wikitext.sdk=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.sdk-feature
+!*******  FEATURES   ******** 
+feature@org.eclipse.mylyn_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn-feature
+feature@org.eclipse.mylyn.context_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context-feature
+feature@org.eclipse.mylyn.bugzilla_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla-feature
+feature@org.eclipse.mylyn.java_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java-feature
+feature@org.eclipse.mylyn.team_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team-feature
+feature@org.eclipse.mylyn.ide_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide-feature
+feature@org.eclipse.mylyn.pde_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.pde-feature
+feature@org.eclipse.mylyn.sdk_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.sdk-feature
+feature@org.eclipse.mylyn.wikitext_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext-feature
+feature@org.eclipse.mylyn.wikitext.sdk=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.sdk-feature
 
-plugin@org.eclipse.mylyn.discovery.core=e_3_4_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.core
-plugin@org.eclipse.mylyn.discovery.ui=e_3_4_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.ui
-plugin@org.eclipse.mylyn.ide.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.ui
-plugin@org.eclipse.mylyn.pde.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.pde.ui
-plugin@org.eclipse.mylyn.tasks.bugs=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.bugs
-plugin@org.eclipse.mylyn.tasks.core=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.core
+!******* EXTRAS ***********
+feature@org.eclipse.mylyn.trac_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac-feature
+feature@org.eclipse.mylyn.jira_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira-feature
+feature@org.eclipse.mylyn.web.tasks_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.web.tasks-feature
+feature@org.eclipse.mylyn.extras_sdk_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.extras-sdk-feature
 
-plugin@org.eclipse.mylyn.discovery.tests=e_3_4_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.tests
+!******* INCUBATOR *******
+feature@org.eclipse.mylyn.monitor_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor-feature
+feature@org.eclipse.mylyn.xplanner_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner-feature
+feature@org.eclipse.mylyn.sandbox.ui_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.ui-feature
+feature@org.eclipse.mylyn.sandbox.dev_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.dev-feature
+feature@org.eclipse.mylyn.trac.wiki_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.trac.wiki-feature
+feature@org.eclipse.mylyn.experimental_sdk_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.experimental-sdk-feature
+
+!******* OTHER *******
+feature@org.eclipse.mylyn.test_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.test-feature
+feature@org.eclipse.mylyn.tests.performance_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.tests.performance-feature
+
+
+!******* PLUGINS **********
+plugin@org.eclipse.mylyn=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn
+plugin@org.eclipse.mylyn.bugzilla.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core
+plugin@org.eclipse.mylyn.bugzilla.ide=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ide
+plugin@org.eclipse.mylyn.bugzilla.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui
+plugin@org.eclipse.mylyn.commons.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.core
+plugin@org.eclipse.mylyn.commons.net=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.net
+plugin@org.eclipse.mylyn.commons.soap=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.soap
+plugin@org.eclipse.mylyn.commons.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.ui
+plugin@org.eclipse.mylyn.compatibility=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.compatibility
+plugin@org.eclipse.mylyn.context.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context.core
+plugin@org.eclipse.mylyn.context.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context.ui
+plugin@org.eclipse.mylyn.discovery.core=e_3_4_m_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.core
+plugin@org.eclipse.mylyn.discovery.ui=e_3_4_m_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.ui
+plugin@org.eclipse.mylyn.help.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.help.ui
+plugin@org.eclipse.mylyn.ide.ant=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.ant
+plugin@org.eclipse.mylyn.ide.capabilities=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.capabilities
+plugin@org.eclipse.mylyn.ide.dev=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.ide.dev
+plugin@org.eclipse.mylyn.ide.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.ui
+plugin@org.eclipse.mylyn.java.tasks=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java.tasks
+plugin@org.eclipse.mylyn.java.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java.ui
+plugin@org.eclipse.mylyn.jira.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira.core
+plugin@org.eclipse.mylyn.jira.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira.ui
+plugin@org.eclipse.mylyn.monitor.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.core
+plugin@org.eclipse.mylyn.monitor.reports=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.monitor.reports
+plugin@org.eclipse.mylyn.monitor.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.ui
+plugin@org.eclipse.mylyn.monitor.usage=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.usage
+plugin@org.eclipse.mylyn.pde.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.pde.ui
+plugin@org.eclipse.mylyn.resources.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.resources.ui
+plugin@org.eclipse.mylyn.sandbox.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.ui
+plugin@org.eclipse.mylyn.sandbox.dev=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.dev
+plugin@org.eclipse.mylyn.tasks.bugs=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.bugs
+plugin@org.eclipse.mylyn.tasks.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.core
+plugin@org.eclipse.mylyn.tasks.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui
+plugin@org.eclipse.mylyn.team.cvs=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team.cvs
+plugin@org.eclipse.mylyn.team.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team.ui
+plugin@org.eclipse.mylyn.trac.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac.core
+plugin@org.eclipse.mylyn.trac.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac.ui
+plugin@org.eclipse.mylyn.trac.wiki=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.trac.wiki
+plugin@org.eclipse.mylyn.web.tasks=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.web.tasks
+plugin@org.eclipse.mylyn.wikitext.confluence.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.confluence.core
+plugin@org.eclipse.mylyn.wikitext.confluence.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.confluence.ui
+plugin@org.eclipse.mylyn.wikitext.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.core
+plugin@org.eclipse.mylyn.wikitext.help.sdk=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.help.sdk
+plugin@org.eclipse.mylyn.wikitext.help.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.help.ui
+plugin@org.eclipse.mylyn.wikitext.mediawiki.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.mediawiki.core
+plugin@org.eclipse.mylyn.wikitext.mediawiki.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.mediawiki.ui
+plugin@org.eclipse.mylyn.wikitext.tasks.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tasks.ui
+plugin@org.eclipse.mylyn.wikitext.textile.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.textile.core
+plugin@org.eclipse.mylyn.wikitext.textile.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.textile.ui
+plugin@org.eclipse.mylyn.wikitext.tracwiki.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tracwiki.core
+plugin@org.eclipse.mylyn.wikitext.tracwiki.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tracwiki.ui
+plugin@org.eclipse.mylyn.wikitext.twiki.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.twiki.core
+plugin@org.eclipse.mylyn.wikitext.twiki.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.twiki.ui
+plugin@org.eclipse.mylyn.wikitext.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.ui
+plugin@org.eclipse.mylyn.xplanner.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner.core
+plugin@org.eclipse.mylyn.xplanner.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner.ui
+
+plugin@org.eclipse.mylyn.bugzilla.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.tests
+plugin@org.eclipse.mylyn.commons.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.tests
+plugin@org.eclipse.mylyn.context.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context.tests
+plugin@org.eclipse.mylyn.discovery.tests=e_3_4_m_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.tests
+plugin@org.eclipse.mylyn.ide.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.tests
+plugin@org.eclipse.mylyn.java.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java.tests
+plugin@org.eclipse.mylyn.jira.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira.tests
+plugin@org.eclipse.mylyn.monitor.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.tests
+plugin@org.eclipse.mylyn.resources.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.resources.tests
+plugin@org.eclipse.mylyn.sandbox.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.tests
+plugin@org.eclipse.mylyn.tasks.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.tests
+plugin@org.eclipse.mylyn.team.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team.tests
+plugin@org.eclipse.mylyn.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tests
+plugin@org.eclipse.mylyn.tests.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tests.ui
+plugin@org.eclipse.mylyn.tests.performance=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tests.performance
+plugin@org.eclipse.mylyn.trac.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac.tests
+plugin@org.eclipse.mylyn.wikitext.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tests
+plugin@org.eclipse.mylyn.xplanner.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner.tests
+
+feature@org.eclipse.cdt.mylyn=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.cdt-feature
+plugin@org.eclipse.cdt.mylyn.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.cdt.ui
diff --git a/org.eclipse.mylyn.releng/maps/mylyn_e3.5.map b/org.eclipse.mylyn.releng/maps/mylyn_e3.5.map
index 72a94aa..5cf9f92 100644
--- a/org.eclipse.mylyn.releng/maps/mylyn_e3.5.map
+++ b/org.eclipse.mylyn.releng/maps/mylyn_e3.5.map
@@ -1,19 +1,110 @@
-feature@org.eclipse.mylyn_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn-feature
-feature@org.eclipse.mylyn.context_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context-feature
-feature@org.eclipse.mylyn.bugzilla_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla-feature
-feature@org.eclipse.mylyn.java_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java-feature
-feature@org.eclipse.mylyn.team_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team-feature
-feature@org.eclipse.mylyn.ide_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide-feature
-feature@org.eclipse.mylyn.pde_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.pde-feature
-feature@org.eclipse.mylyn.sdk_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.sdk-feature
-feature@org.eclipse.mylyn.wikitext_feature=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext-feature
-feature@org.eclipse.mylyn.wikitext.sdk=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.sdk-feature
+!*******  FEATURES   ******** 
+feature@org.eclipse.mylyn_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn-feature
+feature@org.eclipse.mylyn.context_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context-feature
+feature@org.eclipse.mylyn.bugzilla_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla-feature
+feature@org.eclipse.mylyn.java_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java-feature
+feature@org.eclipse.mylyn.team_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team-feature
+feature@org.eclipse.mylyn.ide_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide-feature
+feature@org.eclipse.mylyn.pde_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.pde-feature
+feature@org.eclipse.mylyn.sdk_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.sdk-feature
+feature@org.eclipse.mylyn.wikitext_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext-feature
+feature@org.eclipse.mylyn.wikitext.sdk=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.sdk-feature
 
-plugin@org.eclipse.mylyn.discovery.core=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.core
-plugin@org.eclipse.mylyn.discovery.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.ui
-plugin@org.eclipse.mylyn.ide.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.ui
-plugin@org.eclipse.mylyn.pde.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.pde.ui
-plugin@org.eclipse.mylyn.tasks.bugs=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.bugs
-plugin@org.eclipse.mylyn.tasks.core=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.core
+!******* EXTRAS ***********
+feature@org.eclipse.mylyn.trac_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac-feature
+feature@org.eclipse.mylyn.jira_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira-feature
+feature@org.eclipse.mylyn.web.tasks_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.web.tasks-feature
+feature@org.eclipse.mylyn.extras_sdk_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.extras-sdk-feature
 
-plugin@org.eclipse.mylyn.discovery.tests=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.tests
+!******* INCUBATOR *******
+feature@org.eclipse.mylyn.monitor_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor-feature
+feature@org.eclipse.mylyn.xplanner_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner-feature
+feature@org.eclipse.mylyn.sandbox.ui_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.ui-feature
+feature@org.eclipse.mylyn.sandbox.dev_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.dev-feature
+feature@org.eclipse.mylyn.trac.wiki_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.trac.wiki-feature
+feature@org.eclipse.mylyn.experimental_sdk_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.experimental-sdk-feature
+
+!******* OTHER *******
+feature@org.eclipse.mylyn.test_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.test-feature
+feature@org.eclipse.mylyn.tests.performance_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.tests.performance-feature
+
+
+!******* PLUGINS **********
+plugin@org.eclipse.mylyn=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn
+plugin@org.eclipse.mylyn.bugzilla.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core
+plugin@org.eclipse.mylyn.bugzilla.ide=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ide
+plugin@org.eclipse.mylyn.bugzilla.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui
+plugin@org.eclipse.mylyn.commons.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.core
+plugin@org.eclipse.mylyn.commons.net=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.net
+plugin@org.eclipse.mylyn.commons.soap=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.soap
+plugin@org.eclipse.mylyn.commons.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.ui
+plugin@org.eclipse.mylyn.compatibility=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.compatibility
+plugin@org.eclipse.mylyn.context.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context.core
+plugin@org.eclipse.mylyn.context.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context.ui
+plugin@org.eclipse.mylyn.discovery.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.core
+plugin@org.eclipse.mylyn.discovery.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.ui
+plugin@org.eclipse.mylyn.help.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.help.ui
+plugin@org.eclipse.mylyn.ide.ant=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.ant
+plugin@org.eclipse.mylyn.ide.capabilities=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.capabilities
+plugin@org.eclipse.mylyn.ide.dev=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.ide.dev
+plugin@org.eclipse.mylyn.ide.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.ui
+plugin@org.eclipse.mylyn.java.tasks=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java.tasks
+plugin@org.eclipse.mylyn.java.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java.ui
+plugin@org.eclipse.mylyn.jira.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira.core
+plugin@org.eclipse.mylyn.jira.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira.ui
+plugin@org.eclipse.mylyn.monitor.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.core
+plugin@org.eclipse.mylyn.monitor.reports=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.monitor.reports
+plugin@org.eclipse.mylyn.monitor.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.ui
+plugin@org.eclipse.mylyn.monitor.usage=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.usage
+plugin@org.eclipse.mylyn.pde.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.pde.ui
+plugin@org.eclipse.mylyn.resources.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.resources.ui
+plugin@org.eclipse.mylyn.sandbox.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.ui
+plugin@org.eclipse.mylyn.sandbox.dev=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.dev
+plugin@org.eclipse.mylyn.tasks.bugs=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.bugs
+plugin@org.eclipse.mylyn.tasks.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.core
+plugin@org.eclipse.mylyn.tasks.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui
+plugin@org.eclipse.mylyn.team.cvs=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team.cvs
+plugin@org.eclipse.mylyn.team.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team.ui
+plugin@org.eclipse.mylyn.trac.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac.core
+plugin@org.eclipse.mylyn.trac.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac.ui
+plugin@org.eclipse.mylyn.trac.wiki=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.trac.wiki
+plugin@org.eclipse.mylyn.web.tasks=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.web.tasks
+plugin@org.eclipse.mylyn.wikitext.confluence.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.confluence.core
+plugin@org.eclipse.mylyn.wikitext.confluence.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.confluence.ui
+plugin@org.eclipse.mylyn.wikitext.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.core
+plugin@org.eclipse.mylyn.wikitext.help.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.help.ui
+plugin@org.eclipse.mylyn.wikitext.help.sdk=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.help.sdk
+plugin@org.eclipse.mylyn.wikitext.mediawiki.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.mediawiki.core
+plugin@org.eclipse.mylyn.wikitext.mediawiki.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.mediawiki.ui
+plugin@org.eclipse.mylyn.wikitext.tasks.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tasks.ui
+plugin@org.eclipse.mylyn.wikitext.textile.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.textile.core
+plugin@org.eclipse.mylyn.wikitext.textile.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.textile.ui
+plugin@org.eclipse.mylyn.wikitext.tracwiki.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tracwiki.core
+plugin@org.eclipse.mylyn.wikitext.tracwiki.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tracwiki.ui
+plugin@org.eclipse.mylyn.wikitext.twiki.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.twiki.core
+plugin@org.eclipse.mylyn.wikitext.twiki.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.twiki.ui
+plugin@org.eclipse.mylyn.wikitext.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.ui
+plugin@org.eclipse.mylyn.xplanner.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner.core
+plugin@org.eclipse.mylyn.xplanner.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner.ui
+
+plugin@org.eclipse.mylyn.bugzilla.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.tests
+plugin@org.eclipse.mylyn.commons.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.tests
+plugin@org.eclipse.mylyn.context.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context.tests
+plugin@org.eclipse.mylyn.discovery.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.tests
+plugin@org.eclipse.mylyn.ide.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.tests
+plugin@org.eclipse.mylyn.java.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java.tests
+plugin@org.eclipse.mylyn.jira.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira.tests
+plugin@org.eclipse.mylyn.monitor.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.tests
+plugin@org.eclipse.mylyn.resources.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.resources.tests
+plugin@org.eclipse.mylyn.sandbox.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.tests
+plugin@org.eclipse.mylyn.tasks.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.tests
+plugin@org.eclipse.mylyn.team.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team.tests
+plugin@org.eclipse.mylyn.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tests
+plugin@org.eclipse.mylyn.tests.performance=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tests.performance
+plugin@org.eclipse.mylyn.tests.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tests.ui
+plugin@org.eclipse.mylyn.trac.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac.tests
+plugin@org.eclipse.mylyn.wikitext.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tests
+plugin@org.eclipse.mylyn.xplanner.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner.tests
+
+feature@org.eclipse.cdt.mylyn=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.cdt-feature
+plugin@org.eclipse.cdt.mylyn.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.cdt.ui
\ No newline at end of file
diff --git a/org.eclipse.mylyn.releng/maps/mylyn_e3.6.map b/org.eclipse.mylyn.releng/maps/mylyn_e3.6.map
new file mode 100644
index 0000000..5cf9f92
--- /dev/null
+++ b/org.eclipse.mylyn.releng/maps/mylyn_e3.6.map
@@ -0,0 +1,110 @@
+!*******  FEATURES   ******** 
+feature@org.eclipse.mylyn_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn-feature
+feature@org.eclipse.mylyn.context_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context-feature
+feature@org.eclipse.mylyn.bugzilla_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla-feature
+feature@org.eclipse.mylyn.java_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java-feature
+feature@org.eclipse.mylyn.team_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team-feature
+feature@org.eclipse.mylyn.ide_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide-feature
+feature@org.eclipse.mylyn.pde_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.pde-feature
+feature@org.eclipse.mylyn.sdk_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.sdk-feature
+feature@org.eclipse.mylyn.wikitext_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext-feature
+feature@org.eclipse.mylyn.wikitext.sdk=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.sdk-feature
+
+!******* EXTRAS ***********
+feature@org.eclipse.mylyn.trac_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac-feature
+feature@org.eclipse.mylyn.jira_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira-feature
+feature@org.eclipse.mylyn.web.tasks_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.web.tasks-feature
+feature@org.eclipse.mylyn.extras_sdk_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.extras-sdk-feature
+
+!******* INCUBATOR *******
+feature@org.eclipse.mylyn.monitor_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor-feature
+feature@org.eclipse.mylyn.xplanner_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner-feature
+feature@org.eclipse.mylyn.sandbox.ui_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.ui-feature
+feature@org.eclipse.mylyn.sandbox.dev_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.dev-feature
+feature@org.eclipse.mylyn.trac.wiki_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.trac.wiki-feature
+feature@org.eclipse.mylyn.experimental_sdk_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.experimental-sdk-feature
+
+!******* OTHER *******
+feature@org.eclipse.mylyn.test_feature=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.test-feature
+feature@org.eclipse.mylyn.tests.performance_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.tests.performance-feature
+
+
+!******* PLUGINS **********
+plugin@org.eclipse.mylyn=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn
+plugin@org.eclipse.mylyn.bugzilla.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core
+plugin@org.eclipse.mylyn.bugzilla.ide=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ide
+plugin@org.eclipse.mylyn.bugzilla.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui
+plugin@org.eclipse.mylyn.commons.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.core
+plugin@org.eclipse.mylyn.commons.net=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.net
+plugin@org.eclipse.mylyn.commons.soap=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.soap
+plugin@org.eclipse.mylyn.commons.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.ui
+plugin@org.eclipse.mylyn.compatibility=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.compatibility
+plugin@org.eclipse.mylyn.context.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context.core
+plugin@org.eclipse.mylyn.context.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context.ui
+plugin@org.eclipse.mylyn.discovery.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.core
+plugin@org.eclipse.mylyn.discovery.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.ui
+plugin@org.eclipse.mylyn.help.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.help.ui
+plugin@org.eclipse.mylyn.ide.ant=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.ant
+plugin@org.eclipse.mylyn.ide.capabilities=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.capabilities
+plugin@org.eclipse.mylyn.ide.dev=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.ide.dev
+plugin@org.eclipse.mylyn.ide.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.ui
+plugin@org.eclipse.mylyn.java.tasks=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java.tasks
+plugin@org.eclipse.mylyn.java.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java.ui
+plugin@org.eclipse.mylyn.jira.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira.core
+plugin@org.eclipse.mylyn.jira.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira.ui
+plugin@org.eclipse.mylyn.monitor.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.core
+plugin@org.eclipse.mylyn.monitor.reports=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.monitor.reports
+plugin@org.eclipse.mylyn.monitor.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.ui
+plugin@org.eclipse.mylyn.monitor.usage=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.usage
+plugin@org.eclipse.mylyn.pde.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.pde.ui
+plugin@org.eclipse.mylyn.resources.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.resources.ui
+plugin@org.eclipse.mylyn.sandbox.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.ui
+plugin@org.eclipse.mylyn.sandbox.dev=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.dev
+plugin@org.eclipse.mylyn.tasks.bugs=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.bugs
+plugin@org.eclipse.mylyn.tasks.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.core
+plugin@org.eclipse.mylyn.tasks.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui
+plugin@org.eclipse.mylyn.team.cvs=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team.cvs
+plugin@org.eclipse.mylyn.team.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team.ui
+plugin@org.eclipse.mylyn.trac.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac.core
+plugin@org.eclipse.mylyn.trac.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac.ui
+plugin@org.eclipse.mylyn.trac.wiki=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.trac.wiki
+plugin@org.eclipse.mylyn.web.tasks=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.web.tasks
+plugin@org.eclipse.mylyn.wikitext.confluence.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.confluence.core
+plugin@org.eclipse.mylyn.wikitext.confluence.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.confluence.ui
+plugin@org.eclipse.mylyn.wikitext.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.core
+plugin@org.eclipse.mylyn.wikitext.help.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.help.ui
+plugin@org.eclipse.mylyn.wikitext.help.sdk=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.help.sdk
+plugin@org.eclipse.mylyn.wikitext.mediawiki.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.mediawiki.core
+plugin@org.eclipse.mylyn.wikitext.mediawiki.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.mediawiki.ui
+plugin@org.eclipse.mylyn.wikitext.tasks.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tasks.ui
+plugin@org.eclipse.mylyn.wikitext.textile.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.textile.core
+plugin@org.eclipse.mylyn.wikitext.textile.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.textile.ui
+plugin@org.eclipse.mylyn.wikitext.tracwiki.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tracwiki.core
+plugin@org.eclipse.mylyn.wikitext.tracwiki.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tracwiki.ui
+plugin@org.eclipse.mylyn.wikitext.twiki.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.twiki.core
+plugin@org.eclipse.mylyn.wikitext.twiki.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.twiki.ui
+plugin@org.eclipse.mylyn.wikitext.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.ui
+plugin@org.eclipse.mylyn.xplanner.core=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner.core
+plugin@org.eclipse.mylyn.xplanner.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner.ui
+
+plugin@org.eclipse.mylyn.bugzilla.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.tests
+plugin@org.eclipse.mylyn.commons.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.tests
+plugin@org.eclipse.mylyn.context.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context.tests
+plugin@org.eclipse.mylyn.discovery.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.tests
+plugin@org.eclipse.mylyn.ide.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.tests
+plugin@org.eclipse.mylyn.java.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java.tests
+plugin@org.eclipse.mylyn.jira.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira.tests
+plugin@org.eclipse.mylyn.monitor.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.tests
+plugin@org.eclipse.mylyn.resources.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.resources.tests
+plugin@org.eclipse.mylyn.sandbox.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.tests
+plugin@org.eclipse.mylyn.tasks.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.tests
+plugin@org.eclipse.mylyn.team.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team.tests
+plugin@org.eclipse.mylyn.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tests
+plugin@org.eclipse.mylyn.tests.performance=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tests.performance
+plugin@org.eclipse.mylyn.tests.ui=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tests.ui
+plugin@org.eclipse.mylyn.trac.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac.tests
+plugin@org.eclipse.mylyn.wikitext.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tests
+plugin@org.eclipse.mylyn.xplanner.tests=R_3_2_0,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner.tests
+
+feature@org.eclipse.cdt.mylyn=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.cdt-feature
+plugin@org.eclipse.cdt.mylyn.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.cdt.ui
\ No newline at end of file
diff --git a/org.eclipse.mylyn.releng/maps/orbit.map b/org.eclipse.mylyn.releng/maps/orbit.map
index 43cefdf..a3341ed 100644
--- a/org.eclipse.mylyn.releng/maps/orbit.map
+++ b/org.eclipse.mylyn.releng/maps/orbit.map
@@ -1,18 +1,18 @@
-plugin@com.sun.syndication,0.9.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/com.sun.syndication_0.9.0.v200803061811.jar
-plugin@javax.activation,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/javax.activation_1.1.0.v200906290531.jar
-plugin@javax.mail,1.4.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/javax.mail_1.4.0.v200905040518.jar
-plugin@javax.servlet,2.4.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/javax.servlet_2.4.0.v200806031604.jar
-plugin@javax.xml.bind,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/javax.xml.bind_2.0.0.v20080604-1500.jar
-plugin@javax.xml.rpc,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/javax.xml.rpc_1.1.0.v200905122109.zip,unpack=true
-plugin@javax.xml.soap,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/javax.xml.soap_1.2.0.v200905122109.zip,unpack=true
-plugin@javax.wsdl,1.6.2=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/javax.wsdl_1.6.2.v200806030405.jar
-plugin@org.apache.ant,1.7.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/org.apache.ant_1.7.0.v20080627-1145.zip,unpack=true
-plugin@org.apache.axis,1.4.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/org.apache.axis_1.4.0.v200905122109.zip,unpack=true
-plugin@org.apache.commons.codec,1.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/org.apache.commons.codec_1.3.0.v20080530-1600.jar
-plugin@org.apache.commons.discovery,0.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/org.apache.commons.discovery_0.2.0.v200905122109.zip,unpack=true
-plugin@org.apache.commons.httpclient,3.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/org.apache.commons.httpclient_3.1.0.v20080605-1935.jar
-plugin@org.apache.commons.lang,2.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/org.apache.commons.lang_2.3.0.v200803061910.jar
-plugin@org.apache.commons.logging,1.0.4=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/org.apache.commons.logging_1.0.4.v200904062259.jar
-plugin@org.apache.xmlrpc,3.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/org.apache.xmlrpc_3.0.0.v20080530-1550.jar
-plugin@org.apache.ws.commons.util,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/org.apache.ws.commons.util_1.0.0.v20081204.jar
-plugin@org.jdom,1.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/org.jdom_1.0.0.v200806100616.jar
+plugin@com.sun.syndication,0.9.0=GET,http://eclipse.unixheads.org/tools/orbit/downloads/drops/R20090529135407/bundles/com.sun.syndication_0.9.0.v200803061811.jar
+plugin@javax.activation,1.1.0=GET,http://eclipse.unixheads.org/tools/orbit/downloads/drops/R20090529135407/bundles/javax.activation_1.1.0.v200905021805.jar
+plugin@javax.mail,1.4.0=GET,http://eclipse.unixheads.org/tools/orbit/downloads/drops/R20090529135407/bundles/javax.mail_1.4.0.v200905040518.jar
+plugin@javax.servlet,2.4.0=GET,http://eclipse.unixheads.org/tools/orbit/downloads/drops/R20090529135407/bundles/javax.servlet_2.4.0.v200806031604.jar
+plugin@javax.xml.bind,2.0.0=GET,http://eclipse.unixheads.org/tools/orbit/downloads/drops/R20090529135407/bundles/javax.xml.bind_2.0.0.v20080604-1500.jar
+plugin@javax.xml.rpc,1.1.0=GET,http://eclipse.unixheads.org/tools/orbit/downloads/drops/R20090529135407/bundles/javax.xml.rpc_1.1.0.v200905122109.zip,unpack=true
+plugin@javax.xml.soap,1.2.0=GET,http://eclipse.unixheads.org/tools/orbit/downloads/drops/R20090529135407/bundles/javax.xml.soap_1.2.0.v200905122109.zip,unpack=true
+plugin@javax.wsdl,1.6.2=GET,http://eclipse.unixheads.org/tools/orbit/downloads/drops/R20090529135407/bundles/javax.wsdl_1.6.2.v200806030405.jar
+plugin@org.apache.ant,1.7.0=GET,http://eclipse.unixheads.org/tools/orbit/downloads/drops/R20090529135407/bundles/org.apache.ant_1.7.0.v20080627-1145.zip,unpack=true
+plugin@org.apache.axis,1.4.0=GET,http://eclipse.unixheads.org/tools/orbit/downloads/drops/R20090529135407/bundles/org.apache.axis_1.4.0.v200905122109.zip,unpack=true
+plugin@org.apache.commons.codec,1.3.0=GET,http://eclipse.unixheads.org/tools/orbit/downloads/drops/R20090529135407/bundles/org.apache.commons.codec_1.3.0.v20080530-1600.jar
+plugin@org.apache.commons.discovery,0.2.0=GET,http://eclipse.unixheads.org/tools/orbit/downloads/drops/R20090529135407/bundles/org.apache.commons.discovery_0.2.0.v200905122109.zip,unpack=true
+plugin@org.apache.commons.httpclient,3.1.0=GET,http://eclipse.unixheads.org/tools/orbit/downloads/drops/R20090529135407/bundles/org.apache.commons.httpclient_3.1.0.v20080605-1935.jar
+plugin@org.apache.commons.lang,2.3.0=GET,http://eclipse.unixheads.org/tools/orbit/downloads/drops/R20090529135407/bundles/org.apache.commons.lang_2.3.0.v200803061910.jar
+plugin@org.apache.commons.logging,1.0.4=GET,http://eclipse.unixheads.org/tools/orbit/downloads/drops/R20090529135407/bundles/org.apache.commons.logging_1.0.4.v200904062259.jar
+plugin@org.apache.xmlrpc,3.0.0=GET,http://eclipse.unixheads.org/tools/orbit/downloads/drops/R20090529135407/bundles/org.apache.xmlrpc_3.0.0.v20080530-1550.jar
+plugin@org.apache.ws.commons.util,1.0.0=GET,http://eclipse.unixheads.org/tools/orbit/downloads/drops/R20090529135407/bundles/org.apache.ws.commons.util_1.0.0.v20081204.jar
+plugin@org.jdom,1.0.0=GET,http://eclipse.unixheads.org/tools/orbit/downloads/drops/R20090529135407/bundles/org.jdom_1.0.0.v200806100616.jar
diff --git a/org.eclipse.mylyn.releng/maps/wikitext.map b/org.eclipse.mylyn.releng/maps/wikitext.map
deleted file mode 100644
index 0e92327..0000000
--- a/org.eclipse.mylyn.releng/maps/wikitext.map
+++ /dev/null
@@ -1,17 +0,0 @@
-plugin@org.eclipse.mylyn.wikitext.confluence.core=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.confluence.core
-plugin@org.eclipse.mylyn.wikitext.confluence.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.confluence.ui
-plugin@org.eclipse.mylyn.wikitext.core=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.core
-plugin@org.eclipse.mylyn.wikitext.help.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.help.ui
-plugin@org.eclipse.mylyn.wikitext.help.sdk=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.help.sdk
-plugin@org.eclipse.mylyn.wikitext.mediawiki.core=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.mediawiki.core
-plugin@org.eclipse.mylyn.wikitext.mediawiki.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.mediawiki.ui
-plugin@org.eclipse.mylyn.wikitext.tasks.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tasks.ui
-plugin@org.eclipse.mylyn.wikitext.textile.core=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.textile.core
-plugin@org.eclipse.mylyn.wikitext.textile.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.textile.ui
-plugin@org.eclipse.mylyn.wikitext.tracwiki.core=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tracwiki.core
-plugin@org.eclipse.mylyn.wikitext.tracwiki.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tracwiki.ui
-plugin@org.eclipse.mylyn.wikitext.twiki.core=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.twiki.core
-plugin@org.eclipse.mylyn.wikitext.twiki.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.twiki.ui
-plugin@org.eclipse.mylyn.wikitext.ui=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.ui
-
-plugin@org.eclipse.mylyn.wikitext.tests=e_3_5_m_3_2_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tests