synch up and cleanup for map versions
diff --git a/releng.wtpbuilder/components/xsl/customTargets.xml b/releng.wtpbuilder/components/xsl/customTargets.xml
index 6a85143..9abe072 100644
--- a/releng.wtpbuilder/components/xsl/customTargets.xml
+++ b/releng.wtpbuilder/components/xsl/customTargets.xml
@@ -202,8 +202,7 @@
     <target name="postGenerate">
         <echo message="buildDirectory: ${buildDirectory}" />
         <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"
-            defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*" />
+            bundleDirectory="${buildDirectory}/plugins"/>
     </target>
 
 
diff --git a/releng.wtpbuilder/components/xsl_sdk/customTargets.xml b/releng.wtpbuilder/components/xsl_sdk/customTargets.xml
index e2251ac..77c5280 100644
--- a/releng.wtpbuilder/components/xsl_sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/xsl_sdk/customTargets.xml
@@ -129,6 +129,17 @@
           target="maputil">
           <property
               name="mapcomponent"
+              value="${env.RELENG}"/>
+          <property
+              name="mapTag"
+              value="${mapVersionTag}"/>
+      </ant>
+    	
+      <ant
+          antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
+          target="maputil">
+          <property
+              name="mapcomponent"
               value="${env.RELENGINCUBATOR}"/>
           <property
               name="mapTag"
@@ -190,8 +201,7 @@
     <target name="postGenerate">
         <echo message="buildDirectory: ${buildDirectory}" />
         <customizeAccessRules
-            bundleDirectory="${buildDirectory}/plugins"
-            defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*" />
+            bundleDirectory="${buildDirectory}/plugins"/>
     </target>
 
 
diff --git a/releng.wtpbuilder/components/xsl_tests/customTargets.xml b/releng.wtpbuilder/components/xsl_tests/customTargets.xml
index 720cbb5..857830c 100644
--- a/releng.wtpbuilder/components/xsl_tests/customTargets.xml
+++ b/releng.wtpbuilder/components/xsl_tests/customTargets.xml
@@ -131,6 +131,17 @@
           target="maputil">
           <property
               name="mapcomponent"
+              value="${env.RELENG}"/>
+          <property
+              name="mapTag"
+              value="${mapVersionTag}"/>
+      </ant>
+    	
+      <ant
+          antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
+          target="maputil">
+          <property
+              name="mapcomponent"
               value="${env.RELENGINCUBATOR}"/>
           <property
               name="mapTag"