diff --git a/product/plugins/com.jboss.jbds.central.discovery/plugin.xml b/product/plugins/com.jboss.jbds.central.discovery/plugin.xml
index 51b28c7..a45d6f1 100644
--- a/product/plugins/com.jboss.jbds.central.discovery/plugin.xml
+++ b/product/plugins/com.jboss.jbds.central.discovery/plugin.xml
@@ -4,6 +4,18 @@
 	<extension
          point="org.eclipse.mylyn.discovery.core.connectorDiscovery">
       
+      <!-- JBDS-2379, JBDS-2278, JBDS-2361, JBIDE-10333 -->
+      <certification id="com.jboss.jbds.discovery.certification.supported" name="Supported" url="https://devstudio.jboss.com">
+         <description>
+Supported by Red Hat.</description>
+         <icon image48="images/redhat_48.png"></icon>
+      </certification>
+      <certification id="com.jboss.jbds.discovery.certification.tested" name="Tested" url="https://devstudio.jboss.com">
+         <description>
+Tested by Red Hat.</description>
+         <icon image48="images/redhat_48.png"></icon>
+      </certification>
+      
       <!-- use connectorCategory relevance value to sort from largest (80) to smallest (20) -->
 
       <!-- a. Web and Mobile Development -->
@@ -20,6 +32,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.a.web"
             groupId="org.jboss.tools.central.discovery.a.web.core"
+            certificationId="com.jboss.jbds.discovery.certification.tested"
             description="JST Server Core, UI, Adapters, User Doc"
             id="org.eclipse.jst.server_core.feature"
             kind="task"
@@ -43,6 +56,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.a.web"
             groupId="org.jboss.tools.central.discovery.a.web.extras"
+            certificationId="com.jboss.jbds.discovery.certification.tested"
             description="Android Development Tools, DDMS, Hierarchy Viewer, OpenGL Tracer, Traceview"
             id="com.android.ide.eclipse.adt"
             kind="task"
@@ -67,6 +81,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.a.web"
             groupId="org.jboss.tools.central.discovery.a.web.extras"
+            certificationId="com.jboss.jbds.discovery.certification.tested"
             description="Google Web Toolkit Designer + WindowBuilder"
             id="com.google.gdt.eclipse.designer.editor.feature"
             kind="task"
@@ -93,6 +108,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.a.web"
             groupId="org.jboss.tools.central.discovery.a.web.extras"
+            certificationId="com.jboss.jbds.discovery.certification.tested"
             description="Google Plugin for Eclipse (GPE) + Google Web Toolkit SDK (GWT)"
             id="com.google.gwt.eclipse.sdkbundle.e42.feature"
             kind="task"
@@ -113,6 +129,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.a.web"
             groupId="org.jboss.tools.central.discovery.a.web.extras"
+            certificationId="com.jboss.jbds.discovery.certification.tested"
             description="Tool support for the Spring Framework"
             id="org.springframework.ide.eclipse.feature"
             kind="task"
@@ -150,6 +167,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.b.scm"
             groupId="org.jboss.tools.central.discovery.b.scm.git"
+            certificationId="com.jboss.jbds.discovery.certification.tested"
             description="Eclipse Team Provider for the Git version control system"
             id="org.eclipse.egit"
             kind="task"
@@ -169,6 +187,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.b.scm"
             groupId="org.jboss.tools.central.discovery.b.scm.git"
+            certificationId="com.jboss.jbds.discovery.certification.tested"
             description="Mylyn support for Eclipse EGit and GitHub"
             id="org.eclipse.egit.mylyn"
             kind="task"
@@ -187,6 +206,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.b.scm"
             groupId="org.jboss.tools.central.discovery.b.scm.svn"
+            certificationId="com.jboss.jbds.discovery.certification.tested"
             description="Eclipse Team Provider for the Subversion version control system, including SVNKit"
             id="org.tigris.subversion.subclipse"
             kind="task"
@@ -205,6 +225,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.b.scm"
             groupId="org.jboss.tools.central.discovery.b.scm.svn"
+            certificationId="com.jboss.jbds.discovery.certification.tested"
             description="Mylyn support for the Subversion version control system, including SVNKit"
             id="org.tigris.subversion.subclipse.mylyn"
             kind="task"
@@ -235,6 +256,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.c.testing"
             groupId="org.jboss.tools.central.discovery.c.testing.local"
+            certificationId="com.jboss.jbds.discovery.certification.tested"
             description="Tool support for Checkstyle"
             id="net.sf.eclipsecs"
             kind="task"
@@ -253,6 +275,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.c.testing"
             groupId="org.jboss.tools.central.discovery.c.testing.local"
+            certificationId="com.jboss.jbds.discovery.certification.tested"
             description="Tool support for FindBugs"
             id="edu.umd.cs.findbugs.plugin.eclipse"
             kind="task"
@@ -273,6 +296,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.c.testing"
             groupId="org.jboss.tools.central.discovery.c.testing.local"
+            certificationId="com.jboss.jbds.discovery.certification.supported"
             description="Mylyn support for reporting JBoss JIRAs and Red Hat Bugzillas"
             id="org.jboss.tools.common.mylyn.feature"
             kind="task"
@@ -291,6 +315,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.c.testing"
             groupId="org.jboss.tools.central.discovery.c.testing.local"
+            certificationId="com.jboss.jbds.discovery.certification.tested"
             description="Tool support for PMD"
             id="net.sourceforge.pmd.eclipse"
             kind="task"
@@ -310,6 +335,7 @@
 	  <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.c.testing"
             groupId="org.jboss.tools.central.discovery.c.testing.local"
+            certificationId="com.jboss.jbds.discovery.certification.supported"
             description="Tool support for TestNG"
             id="org.testng.eclipse"
             kind="task"
@@ -330,6 +356,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.c.testing"
             groupId="org.jboss.tools.central.discovery.c.testing.remote"
+            certificationId="com.jboss.jbds.discovery.certification.tested"
             description="Tool support for JRebel - requires JST Server"
             id="org.zeroturnaround.eclipse.feature"
             kind="task"
@@ -338,8 +365,8 @@
             provider="zeroturnaround.org"
             siteUrl="http://www.zeroturnaround.com/update-site/">
             <iu id="org.zeroturnaround.eclipse.feature"/>
-            <iu id="org.zeroturnaround.eclipse.m2e.feature"/>
             <iu id="org.zeroturnaround.eclipse.wtp.feature"/>
+            <iu id="org.zeroturnaround.eclipse.m2e.feature"/>
          <icon
                image32="images/jrebel_32.png">
          </icon>
@@ -364,6 +391,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.d.maven"
             groupId="org.jboss.tools.central.discovery.d.maven.core"
+            certificationId="com.jboss.jbds.discovery.certification.supported"
             description="JBoss Maven Integration"
             id="org.jboss.tools.maven.feature"
             kind="task"
@@ -382,6 +410,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.d.maven"
             groupId="org.jboss.tools.central.discovery.d.maven.configurators"
+            certificationId="com.jboss.jbds.discovery.certification.supported"
             description="JBoss Maven CDI Configurator"
             id="org.jboss.tools.maven.cdi.feature"
             kind="task"
@@ -400,6 +429,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.d.maven"
             groupId="org.jboss.tools.central.discovery.d.maven.configurators"
+            certificationId="com.jboss.jbds.discovery.certification.supported"
             description="JBoss Maven GWT Configurator"
             id="org.jboss.tools.maven.gwt.feature"
             kind="task"
@@ -419,6 +449,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.d.maven"
             groupId="org.jboss.tools.central.discovery.d.maven.configurators"
+            certificationId="com.jboss.jbds.discovery.certification.supported"
             description="JBoss Maven Hibernate Configurator"
             id="org.jboss.tools.maven.hibernate.feature"
             kind="task"
@@ -437,6 +468,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.d.maven"
             groupId="org.jboss.tools.central.discovery.d.maven.configurators"
+            certificationId="com.jboss.jbds.discovery.certification.supported"
             description="JBoss Maven JAX-RS Configurator"
             id="org.jboss.tools.maven.jaxrs.feature"
             kind="task"
@@ -455,6 +487,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.d.maven"
             groupId="org.jboss.tools.central.discovery.d.maven.configurators"
+            certificationId="com.jboss.jbds.discovery.certification.supported"
             description="JBoss Maven JSF Configurator"
             id="org.jboss.tools.maven.jsf.feature"
             kind="task"
@@ -473,6 +506,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.d.maven"
             groupId="org.jboss.tools.central.discovery.d.maven.configurators"
+            certificationId="com.jboss.jbds.discovery.certification.supported"
             description="JBoss Maven Portlet Configurator"
             id="org.jboss.tools.maven.portlet.feature"
             kind="task"
@@ -491,6 +525,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.d.maven"
             groupId="org.jboss.tools.central.discovery.d.maven.configurators"
+            certificationId="com.jboss.jbds.discovery.certification.supported"
             description="JBoss Maven Seam Configurator"
             id="org.jboss.tools.maven.seam.feature"
             kind="task"
@@ -509,6 +544,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.d.maven"
             groupId="org.jboss.tools.central.discovery.d.maven.configurators"
+            certificationId="com.jboss.jbds.discovery.certification.supported"
             description="JBoss Maven JPA Configurator"
             id="org.jboss.tools.maven.jpa.feature"
             kind="task"
@@ -527,6 +563,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.d.maven"
             groupId="org.jboss.tools.central.discovery.d.maven.configurators"
+            certificationId="com.jboss.jbds.discovery.certification.supported"
             description="Maven Profile Management UI"
             id="org.jboss.tools.maven.profiles.feature"
             kind="task"
@@ -546,6 +583,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.d.maven"
             groupId="org.jboss.tools.central.discovery.d.maven.upstream"
+            certificationId="com.jboss.jbds.discovery.certification.tested"
             description="Maven Integration for Eclipse (m2e)"
             id="org.eclipse.m2e.feature"
             kind="task"
@@ -564,6 +602,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.d.maven"
             groupId="org.jboss.tools.central.discovery.d.maven.upstream"
+            certificationId="com.jboss.jbds.discovery.certification.supported"
             description="Maven Integration for Eclipse JDT APT (m2e-apt)"
             id="org.jboss.tools.maven.apt.feature"
             kind="task"
@@ -582,6 +621,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.d.maven"
             groupId="org.jboss.tools.central.discovery.d.maven.upstream"
+            certificationId="com.jboss.jbds.discovery.certification.supported"
             description="Maven Integration for Web Tools (m2e-wtp)"
             id="org.maven.ide.eclipse.wtp.feature"
             kind="task"