Merge branch 'DE90623_class_format' of ssh://git.eclipse.org:29418/tigerstripe/org.eclipse.tigerstripe into DE90623_class_format

Change-Id: I93c7cd538382fbf757fff2857baf92fcce2bfa3e
diff --git a/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/core/model/AbstractArtifact.java b/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/core/model/AbstractArtifact.java
index 6f8200e..b260b0c 100644
--- a/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/core/model/AbstractArtifact.java
+++ b/core/org.eclipse.tigerstripe.core/src/main/java/org/eclipse/tigerstripe/workbench/internal/core/model/AbstractArtifact.java
@@ -39,6 +39,7 @@
 import org.eclipse.tigerstripe.workbench.internal.core.profile.properties.CoreArtifactSettingsProperty;
 import org.eclipse.tigerstripe.workbench.internal.core.profile.stereotype.InheritedStereotypeInstance;
 import org.eclipse.tigerstripe.workbench.internal.core.profile.stereotype.OverridenStereotypeInstance;
+import org.eclipse.tigerstripe.workbench.internal.core.profile.stereotype.UnresolvedStereotypeInstance;
 import org.eclipse.tigerstripe.workbench.internal.core.project.TigerstripeProject;
 import org.eclipse.tigerstripe.workbench.internal.core.util.ComparableArtifact;
 import org.eclipse.tigerstripe.workbench.internal.core.util.QDoxUtils;
@@ -1943,7 +1944,7 @@
 
         for (IStereotypeInstance inst : artifact.getStereotypeInstances()) {
             // Don't re-add if it's already overriden in a closer parent
-            if ((!(inst instanceof IInheritedStereotypeInstance)) && inst.getCharacterizingStereotype().canInherit()
+            if ( (!(inst instanceof UnresolvedStereotypeInstance)) && (!(inst instanceof IInheritedStereotypeInstance)) && inst.getCharacterizingStereotype().canInherit()
                     && stereotypes.stream().noneMatch(
                             exist -> exist.getCharacterizingStereotype().equals(inst.getCharacterizingStereotype()))) {
                 stereotypes.add(new InheritedStereotypeInstance(inst, artifact));