[127409] fix feature versions and labels

assembly/features/org.eclipse.wst.feature/feature.properties

-providerName=The Eclipse Foundation
+providerName=Eclipse.org
 
-description=Web Standard Tools
+description=Web Standard Tools (WST)
 
 license=\
 Eclipse Foundation Software User Agreement\n\

assembly/features/org.eclipse.wst.feature/feature.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.wst"
-      label="Web Standard Tools Feature"
-      version="1.0.0"
+      label="Web Standard Tools (WST)"
+      version="1.0.1.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -14,37 +14,46 @@
       %license
    </license>
 
+   <url>
+      <update 
+      	label="Web Tools Platform (WTP) Updates" 
+      	url="http://download.eclipse.org/webtools/updates"/>
+
+      <discovery 
+      	label="Web Tools Platform (WTP) Updates" 
+      	url="http://download.eclipse.org/webtools/updates"/>
+      	
+      <discovery 
+      	label="Business Intelligence and Reporting Tools (BIRT) Updates"
+      	url="http://download.eclipse.org/birt/update-site/"/>
+
+      <discovery 
+      	label="Test and Performance Tools Platform (TPTP) Updates"
+      	url="http://download.eclipse.org/tptp/updates/"/>
+
+      		
+   </url>
 
-	<!-- we include all the third party stuff first to get it out 
-	of the way ... none of this is actually "compiled" ... just a
-	assembled, and needs to be there before code is compiled -->
-	
    <includes
          id="org.apache.xerces.feature"
          version="0.0.0"/>
-         
+
    <includes
          id="org.apache.axis.feature"
          version="0.0.0"/>
+
    <includes
          id="org.apache.wsil4j.feature"
          version="0.0.0"/>
-         
+
    <includes
          id="org.uddi4j.feature"
          version="0.0.0"/>
-         
+
    <includes
          id="org.wsdl4j.feature"
          version="0.0.0"/>
-         
-
-
-<!-- note, all core comes before UI ... this might 
-catch a few UI/core bugs? -->
 
-
-       
    <includes
          id="org.eclipse.wst.common_core.feature"
          version="0.0.0"/>
@@ -69,10 +78,6 @@ catch a few UI/core bugs? -->
          id="org.eclipse.wst.rdb_core.feature"
          version="0.0.0"/>
 
-
-
-
-
    <includes
          id="org.eclipse.wst.common_ui.feature"
          version="0.0.0"/>
@@ -84,7 +89,7 @@ catch a few UI/core bugs? -->
    <includes
          id="org.eclipse.wst.xml_ui.feature"
          version="0.0.0"/>
-             
+
    <includes
          id="org.eclipse.wst.ws_ui.feature"
          version="0.0.0"/>
@@ -97,13 +102,10 @@ catch a few UI/core bugs? -->
          id="org.eclipse.wst.rdb_ui.feature"
          version="0.0.0"/>
 
-
-
    <includes
          id="org.eclipse.wst.rdb_adapters.feature"
          version="0.0.0"/>
 
-
    <plugin
          id="org.eclipse.wst"
          download-size="0"