Revert unintentional API changes.

Change-Id: Ib7c2feb41a770ab530f2746eb7cd0317b82aa4fd
diff --git a/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/core/generation/RunConfig.java b/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/core/generation/RunConfig.java
index 1f81e0d..048eb4f 100644
--- a/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/core/generation/RunConfig.java
+++ b/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/core/generation/RunConfig.java
@@ -56,7 +56,7 @@
 	 * @exception TigerstripeException
 	 * @return
 	 */
-	public static IRunConfig newGenerationConfig(ITigerstripeModelProject project, int runType)
+	public static RunConfig newGenerationConfig(ITigerstripeModelProject project, int runType)
 			throws TigerstripeException {
 		RunConfig result = null;
 		switch (runType) {
diff --git a/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/core/plugin/PluginManager.java b/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/core/plugin/PluginManager.java
index 5018d90..3c8f628 100644
--- a/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/core/plugin/PluginManager.java
+++ b/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/core/plugin/PluginManager.java
@@ -354,22 +354,22 @@
         this.housings.remove(housing);
     }
     
-//    /**
-//     * 
-//     * @param housings
-//     * @param plugins
-//     * @return
-//     * @deprecated - Use {@link #findMatchingPlugin(Collection, IPluginConfig[])} instead which accepts and returns interface classes
-//     */
-//    @Deprecated
-//    public org.eclipse.tigerstripe.workbench.internal.core.util.MatchedConfigHousing resolve(Collection<PluggableHousing> housings, IPluginConfig[] plugins) {
-//        MatchedConfigHousing configHousing = findMatchingPlugin(housings.stream().filter(IPluggablePluginHousing.class::isInstance)
-//                .map(IPluggablePluginHousing.class::cast).collect(Collectors.toList()), plugins);
-//        if (configHousing != null && configHousing.getHousing() instanceof PluggableHousing) {
-//            return new org.eclipse.tigerstripe.workbench.internal.core.util.MatchedConfigHousing(configHousing.getConfig(), (PluggableHousing) configHousing.getHousing());
-//        }
-//        return null;
-//    }
+   /**
+    * 
+    * @param housings
+    * @param plugins
+    * @return
+    * @deprecated - Use {@link #findMatchingPlugin(Collection, IPluginConfig[])} instead which accepts and returns interface classes
+    */
+   @Deprecated
+   public org.eclipse.tigerstripe.workbench.internal.core.util.MatchedConfigHousing resolve(Collection<PluggableHousing> housings, IPluginConfig[] plugins) {
+       MatchedConfigHousing configHousing = findMatchingPlugin(housings.stream().filter(IPluggablePluginHousing.class::isInstance)
+               .map(IPluggablePluginHousing.class::cast).collect(Collectors.toList()), plugins);
+       if (configHousing != null && configHousing.getHousing() instanceof PluggableHousing) {
+           return new org.eclipse.tigerstripe.workbench.internal.core.util.MatchedConfigHousing(configHousing.getConfig(), (PluggableHousing) configHousing.getHousing());
+       }
+       return null;
+   }
 
     /*
      * This should only ever be called if the OSGI versioning is being used. The
diff --git a/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/core/util/MatchedConfigHousing.java b/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/core/util/MatchedConfigHousing.java
new file mode 100644
index 0000000..8e6d1a9
--- /dev/null
+++ b/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/core/util/MatchedConfigHousing.java
@@ -0,0 +1,31 @@
+package org.eclipse.tigerstripe.workbench.internal.core.util;
+
+import org.eclipse.tigerstripe.workbench.internal.core.plugin.PluginHousing;
+import org.eclipse.tigerstripe.workbench.internal.core.plugin.pluggable.PluggableHousing;
+import org.eclipse.tigerstripe.workbench.project.IPluginConfig;
+
+/**
+ * 
+ * @deprecated - Replaced by
+ *             {@link org.eclipse.tigerstripe.workbench.internal.core.plugin.pluggable.MatchedConfigHousing}
+ *             in tigerstripe-api project.
+ */
+@Deprecated
+public class MatchedConfigHousing {
+
+    private IPluginConfig config;
+    private PluggableHousing housing;
+
+    public MatchedConfigHousing(IPluginConfig config, PluggableHousing housing) {
+        this.config = config;
+        this.housing = housing;
+    }
+
+    public IPluginConfig getConfig() {
+        return config;
+    }
+
+    public PluggableHousing getHousing() {
+        return housing;
+    }
+}