diff --git a/releng.jsf/maps/jsf-doc.map b/releng.jsf/maps/jsf-doc.map
index 3fe9b6a..6766476 100644
--- a/releng.jsf/maps/jsf-doc.map
+++ b/releng.jsf/maps/jsf-doc.map
@@ -2,9 +2,9 @@
 ! This map file is for the WTP 3.6 release
 ! These bundles are currently being developed and released from the master branch
 
-feature@org.eclipse.jst.jsf.doc.feature=GIT,tag=v201405061152,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.docs.git,path=features/org.eclipse.jst.jsf.doc.feature
+feature@org.eclipse.jst.jsf.doc.feature=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.docs.git,path=features/org.eclipse.jst.jsf.doc.feature
 
-plugin@org.eclipse.jst.jsf.doc.user=GIT,tag=v201405061152,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.docs.git,path=plugins/org.eclipse.jst.jsf.doc.user
-plugin@org.eclipse.jst.jsf.doc.dev=GIT,tag=v201405061152,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.docs.git,path=plugins/org.eclipse.jst.jsf.doc.dev
+plugin@org.eclipse.jst.jsf.doc.user=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.docs.git,path=plugins/org.eclipse.jst.jsf.doc.user
+plugin@org.eclipse.jst.jsf.doc.dev=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.docs.git,path=plugins/org.eclipse.jst.jsf.doc.dev
 
 !*************** 
diff --git a/releng.jsf/maps/wtp.jsf.map b/releng.jsf/maps/wtp.jsf.map
index ad5d019..bad2db5 100644
--- a/releng.jsf/maps/wtp.jsf.map
+++ b/releng.jsf/maps/wtp.jsf.map
@@ -2,29 +2,29 @@
 ! This map file is for the WTP 3.6 release
 ! These bundles are currently being developed and released from the master branch
 
-feature@org.eclipse.jst.webpageeditor.feature=GIT,tag=v201408081041,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/features/org.eclipse.jst.webpageeditor.feature
-feature@org.eclipse.jst.webpageeditor_sdk.feature=GIT,tag=v201408081041,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/features/org.eclipse.jst.webpageeditor_sdk.feature
-feature@org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature=GIT,tag=v201408081041,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature
-feature@org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature=GIT,tag=v201408081041,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature
-feature@org.eclipse.jsf.feature=GIT,tag=v201408081041,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/features/org.eclipse.jsf.feature
-feature@org.eclipse.jsf_sdk.feature=GIT,tag=v201408081041,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/features/org.eclipse.jsf_sdk.feature
-feature@org.eclipse.jsf.assembly.feature=GIT,tag=v201408081041,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=assembly/features/org.eclipse.jsf.assembly.feature
-feature@org.eclipse.jsf_sdk.assembly.feature=GIT,tag=v201408081041,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=assembly/features/org.eclipse.jsf_sdk.assembly.feature
+feature@org.eclipse.jst.webpageeditor.feature=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/features/org.eclipse.jst.webpageeditor.feature
+feature@org.eclipse.jst.webpageeditor_sdk.feature=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/features/org.eclipse.jst.webpageeditor_sdk.feature
+feature@org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature
+feature@org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature
+feature@org.eclipse.jsf.feature=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/features/org.eclipse.jsf.feature
+feature@org.eclipse.jsf_sdk.feature=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/features/org.eclipse.jsf_sdk.feature
+feature@org.eclipse.jsf.assembly.feature=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=assembly/features/org.eclipse.jsf.assembly.feature
+feature@org.eclipse.jsf_sdk.assembly.feature=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=assembly/features/org.eclipse.jsf_sdk.assembly.feature
 
-plugin@org.eclipse.jst.jsf.core=GIT,tag=v201408081041,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.jsf.core
-plugin@org.eclipse.jst.jsf.ui=GIT,tag=v201408081041,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.jsf.ui
-plugin@org.eclipse.jst.jsf.facelet.core=GIT,tag=v201408081041,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.jsf.facelet.core
-plugin@org.eclipse.jst.jsf.facelet.ui=GIT,tag=v201408081041,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.jsf.facelet.ui
-plugin@org.eclipse.jst.jsf.facesconfig=GIT,tag=v201408081041,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.jsf.facesconfig
-plugin@org.eclipse.jst.jsf.facesconfig.ui=GIT,tag=v201408081041,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui
-plugin@org.eclipse.jst.jsf.common=GIT,tag=v201408081041,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.jsf.common
-plugin@org.eclipse.jst.jsf.common.ui=GIT,tag=v201408081041,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.jsf.common.ui
-plugin@org.eclipse.jst.jsf.common.runtime=GIT,tag=v201408081041,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.jsf.common.runtime
-plugin@org.eclipse.jst.jsf.standard.tagsupport=GIT,tag=v201408081041,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport
-plugin@org.eclipse.jst.jsf.apache.trinidad.tagsupport=GIT,tag=v201408081041,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport
-plugin@org.eclipse.jst.pagedesigner=GIT,tag=v201408081041,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.pagedesigner
-plugin@org.eclipse.jst.pagedesigner.jsf.ui=GIT,tag=v201408081041,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui
-plugin@org.eclipse.jst.pagedesigner.jsp.core=GIT,tag=v201408081041,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core
-plugin@org.eclipse.jsf.branding=GIT,tag=v201408081041,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=assembly/plugins/org.eclipse.jsf.branding
+plugin@org.eclipse.jst.jsf.core=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.jsf.core
+plugin@org.eclipse.jst.jsf.ui=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.jsf.ui
+plugin@org.eclipse.jst.jsf.facelet.core=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.jsf.facelet.core
+plugin@org.eclipse.jst.jsf.facelet.ui=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.jsf.facelet.ui
+plugin@org.eclipse.jst.jsf.facesconfig=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.jsf.facesconfig
+plugin@org.eclipse.jst.jsf.facesconfig.ui=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui
+plugin@org.eclipse.jst.jsf.common=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.jsf.common
+plugin@org.eclipse.jst.jsf.common.ui=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.jsf.common.ui
+plugin@org.eclipse.jst.jsf.common.runtime=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.jsf.common.runtime
+plugin@org.eclipse.jst.jsf.standard.tagsupport=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport
+plugin@org.eclipse.jst.jsf.apache.trinidad.tagsupport=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport
+plugin@org.eclipse.jst.pagedesigner=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.pagedesigner
+plugin@org.eclipse.jst.pagedesigner.jsf.ui=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui
+plugin@org.eclipse.jst.pagedesigner.jsp.core=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core
+plugin@org.eclipse.jsf.branding=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.git,path=assembly/plugins/org.eclipse.jsf.branding
 
 !***************
diff --git a/releng.jsf/maps/wtp.jsf.tests.map b/releng.jsf/maps/wtp.jsf.tests.map
index c2d5612..972972b 100644
--- a/releng.jsf/maps/wtp.jsf.tests.map
+++ b/releng.jsf/maps/wtp.jsf.tests.map
@@ -2,20 +2,20 @@
 ! This map file is for the WTP 3.6 release
 ! These bundles are currently being developed and released from the master branch
 
-feature@org.eclipse.jst.jsf.tests.feature=GIT,tag=v201405091204,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/features/org.eclipse.jst.jsf.tests.feature
+feature@org.eclipse.jst.jsf.tests.feature=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/features/org.eclipse.jst.jsf.tests.feature
 
-plugin@org.eclipse.jst.jsf.core.tests=GIT,tag=v201405091204,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/tests/org.eclipse.jst.jsf.core.tests
-plugin@org.eclipse.jst.jsf.ui.tests=GIT,tag=v201405091204,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/tests/org.eclipse.jst.jsf.ui.tests
-plugin@org.eclipse.jst.jsf.metadata.tests=GIT,tag=v201405091204,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/tests/org.eclipse.jst.jsf.metadata.tests
-plugin@org.eclipse.jst.jsf.contentassist.tests=GIT,tag=v201405091204,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/tests/org.eclipse.jst.jsf.contentassist.tests
-plugin@org.eclipse.jst.jsf.metadataprocessingtests2=GIT,tag=v201405091204,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2
-plugin@org.eclipse.jst.jsf.test.util=GIT,tag=v201405091204,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/tests/org.eclipse.jst.jsf.test.util
-plugin@org.eclipse.jst.jsf.context.symbol.tests=GIT,tag=v201405091204,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/tests/org.eclipse.jst.jsf.context.symbol.tests
-plugin@org.eclipse.jst.jsf.designtime.tests=GIT,tag=v201405091204,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/tests/org.eclipse.jst.jsf.designtime.tests
-plugin@org.eclipse.jst.jsf.facesconfig.tests=GIT,tag=v201405091204,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/tests/org.eclipse.jst.jsf.facesconfig.tests
-bundle@org.eclipse.jst.jsf.facesconfig.ui.test=GIT,tag=v201405091204,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test
-plugin@org.eclipse.jst.jsf.validation.el.tests=GIT,tag=v201405091204,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/tests/org.eclipse.jst.jsf.validation.el.tests
-plugin@org.eclipse.jst.pagedesigner.tests=GIT,tag=v201405091204,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/tests/org.eclipse.jst.pagedesigner.tests
-plugin@org.eclipse.jst.jsf.common.runtime.tests=GIT,tag=v201405091204,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/tests/org.eclipse.jst.jsf.common.runtime.tests
+plugin@org.eclipse.jst.jsf.core.tests=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/tests/org.eclipse.jst.jsf.core.tests
+plugin@org.eclipse.jst.jsf.ui.tests=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/tests/org.eclipse.jst.jsf.ui.tests
+plugin@org.eclipse.jst.jsf.metadata.tests=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/tests/org.eclipse.jst.jsf.metadata.tests
+plugin@org.eclipse.jst.jsf.contentassist.tests=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/tests/org.eclipse.jst.jsf.contentassist.tests
+plugin@org.eclipse.jst.jsf.metadataprocessingtests2=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2
+plugin@org.eclipse.jst.jsf.test.util=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/tests/org.eclipse.jst.jsf.test.util
+plugin@org.eclipse.jst.jsf.context.symbol.tests=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/tests/org.eclipse.jst.jsf.context.symbol.tests
+plugin@org.eclipse.jst.jsf.designtime.tests=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/tests/org.eclipse.jst.jsf.designtime.tests
+plugin@org.eclipse.jst.jsf.facesconfig.tests=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/tests/org.eclipse.jst.jsf.facesconfig.tests
+bundle@org.eclipse.jst.jsf.facesconfig.ui.test=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test
+plugin@org.eclipse.jst.jsf.validation.el.tests=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/tests/org.eclipse.jst.jsf.validation.el.tests
+plugin@org.eclipse.jst.pagedesigner.tests=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/tests/org.eclipse.jst.pagedesigner.tests
+plugin@org.eclipse.jst.jsf.common.runtime.tests=GIT,tag=v201408211646,repo=git://git.eclipse.org/gitroot/jsf/webtools.jsf.tests.git,path=jsf/tests/org.eclipse.jst.jsf.common.runtime.tests
 
 !***************