RC! bug 252861, 288144, 300454, 307565, 310166, 311105, 311972
diff --git a/releng.jsf/maps/wtp.jsf.map b/releng.jsf/maps/wtp.jsf.map
index 49356b8..7685150 100644
--- a/releng.jsf/maps/wtp.jsf.map
+++ b/releng.jsf/maps/wtp.jsf.map
@@ -2,24 +2,24 @@
 ! This map file is for the WTP 3.1 release
 ! These bundles are currently being developed and released from the HEAD
 
-plugin@org.eclipse.jst.jsf.core=v20100505,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.core
-plugin@org.eclipse.jst.jsf.ui=v20100505,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.ui
+plugin@org.eclipse.jst.jsf.core=v20100510,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.core
+plugin@org.eclipse.jst.jsf.ui=v20100510,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.ui
 
-plugin@org.eclipse.jst.jsf.facelet.core=v20100505,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.facelet.core
-plugin@org.eclipse.jst.jsf.facelet.ui=v20100505,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.facelet.ui
+plugin@org.eclipse.jst.jsf.facelet.core=v20100510,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.facelet.core
+plugin@org.eclipse.jst.jsf.facelet.ui=v20100510,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.facelet.ui
 
 plugin@org.eclipse.jst.jsf.facesconfig=v201004252003,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.facesconfig
 plugin@org.eclipse.jst.jsf.facesconfig.ui=v20100421,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui
 plugin@org.eclipse.jst.jsf.common=v20100505,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.common
 plugin@org.eclipse.jst.jsf.common.ui=v20100329,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.common.ui
-plugin@org.eclipse.jst.jsf.common.runtime=v20100317_2343,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.common.runtime
+plugin@org.eclipse.jst.jsf.common.runtime=v20100510,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.common.runtime
 plugin@org.eclipse.jst.jsf.common.noautostart=v20100421,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.common.noautostart
 
 
-plugin@org.eclipse.jst.jsf.standard.tagsupport=v20100421,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport
+plugin@org.eclipse.jst.jsf.standard.tagsupport=v20100510,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport
 plugin@org.eclipse.jst.jsf.apache.trinidad.tagsupport=v201003141853,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport
 
-plugin@org.eclipse.jst.pagedesigner=v20100425,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner
+plugin@org.eclipse.jst.pagedesigner=v20100510,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner
 plugin@org.eclipse.jst.pagedesigner.jsf.ui=v20100414,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui
 plugin@org.eclipse.jst.pagedesigner.jsp.core=v20100308,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core
 
diff --git a/releng.jsf/maps/wtp.jsf.tests.map b/releng.jsf/maps/wtp.jsf.tests.map
index 3b67689..fcf1be6 100644
--- a/releng.jsf/maps/wtp.jsf.tests.map
+++ b/releng.jsf/maps/wtp.jsf.tests.map
@@ -16,7 +16,7 @@
 plugin@org.eclipse.jst.jsf.facesconfig.tests=v20100428,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests
 bundle@org.eclipse.jst.jsf.facesconfig.ui.test=v20100428,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test
 plugin@org.eclipse.jst.jsf.validation.el.tests=v20100428,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.validation.el.tests
-plugin@org.eclipse.jst.pagedesigner.tests=v20100427,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.pagedesigner.tests
+plugin@org.eclipse.jst.pagedesigner.tests=v20100510,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.pagedesigner.tests
 plugin@org.eclipse.jst.jsf.common.runtime.tests=v20100428,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests