Merge remote-tracking branch 'origin/refactor/move_variability_basic_from_iets3core_1360' into refactor/move_variability_basic_from_iets3core_1360

# Conflicts:
#	code/languages/org.iets3.opensource/tests/test.org.iets3.analysis.base/models/[email protected]

Author: dbinkele

code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.plugin.mps

@@ -13319,7 +13319,7 @@
                 <node concept="2OqwBi" id="7G$l9GLD5VH" role="37wK5m">
                   <node concept="Xjq3P" id="7G$l9GLD5VI" role="2Oq$k0" />
                   <node concept="2OwXpG" id="7G$l9GLD5VJ" role="2OqNvi">
-                    <ref role="2Oxat5" node="7G$l9GLtpLG" resolve="componentNotStaticReferenced" />
+                    <ref role="2Oxat5" node="7G$l9GLtpLG" resolve="componentStaticReferenced" />
                   </node>
                 </node>
               </node>
@@ -13331,7 +13331,7 @@
             <node concept="2OqwBi" id="7G$l9GLCW__" role="2Oq$k0">
               <node concept="Xjq3P" id="7G$l9GLCUPL" role="2Oq$k0" />
               <node concept="2OwXpG" id="7G$l9GLCYj_" role="2OqNvi">
-                <ref role="2Oxat5" node="7G$l9GLtpLG" resolve="componentNotStaticReferenced" />
+                <ref role="2Oxat5" node="7G$l9GLtpLG" resolve="componentStaticReferenced" />
               </node>
             </node>
             <node concept="liA8E" id="7G$l9GLD4w2" role="2OqNvi">

code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.behavior.mps

@@ -414,9 +414,7 @@
       <concept id="1966870290088668512" name="jetbrains.mps.lang.smodel.structure.Enum_MemberLiteral" flags="ng" index="2ViDtV">
         <reference id="1966870290088668516" name="memberDeclaration" index="2ViDtZ" />
       </concept>
-      <concept id="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt">
-        <reference id="1139877738879" name="concept" index="1A0vxQ" />
-      </concept>
+      <concept id="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1240170042401" name="jetbrains.mps.lang.smodel.structure.SEnumerationMemberType" flags="in" index="2ZThk1">
         <reference id="1240170836027" name="enum" index="2ZWj4r" />
@@ -579,21 +577,7 @@
     <property role="3GE5qa" value="_deprecated.chunk" />
     <ref role="13h7C2" to="s6b7:3tsFshP56tQ" resolve="VariabilityModelChunk_old" />
     <node concept="13hLZK" id="3tsFshP56xr" role="13h7CW">
-      <node concept="3clFbS" id="3tsFshP56xs" role="2VODD2">
-        <node concept="3clFbF" id="3tsFshP5xOK" role="3cqZAp">
-          <node concept="2OqwBi" id="3tsFshP5yEZ" role="3clFbG">
-            <node concept="2OqwBi" id="3tsFshP5y0A" role="2Oq$k0">
-              <node concept="13iPFW" id="3tsFshP5xOJ" role="2Oq$k0" />
-              <node concept="3Tsc0h" id="3tsFshP5yev" role="2OqNvi">
-                <ref role="3TtcxE" to="s6b7:3tsFshP58gT" resolve="contents_old" />
-              </node>
-            </node>
-            <node concept="WFELt" id="3tsFshP5zQh" role="2OqNvi">
-              <ref role="1A0vxQ" to="s6b7:3tsFshP5d$8" resolve="EmptyVariabilityContent_old" />
-            </node>
-          </node>
-        </node>
-      </node>
+      <node concept="3clFbS" id="3tsFshP56xs" role="2VODD2" />
     </node>
     <node concept="13i0hz" id="3tsFshP56xt" role="13h7CS">
       <property role="TrG5h" value="chunkDependencies" />

code/languages/org.iets3.opensource/tests/test.org.iets3.analysis.base/models/[email protected]

@@ -25,9 +25,6 @@
   </imports>
   <registry>
     <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
-      <concept id="5097124989038916362" name="jetbrains.mps.lang.test.structure.TestInfo" flags="ng" index="2XOHcx">
-        <property id="5097124989038916363" name="projectPath" index="2XOHcw" />
-      </concept>
       <concept id="1225467090849" name="jetbrains.mps.lang.test.structure.ProjectExpression" flags="nn" index="1jxXqW" />
       <concept id="1225469856668" name="jetbrains.mps.lang.test.structure.ModelExpression" flags="nn" index="1jGwE1" />
       <concept id="1216913645126" name="jetbrains.mps.lang.test.structure.NodesTestCase" flags="lg" index="1lH9Xt">
@@ -2429,8 +2426,5 @@
     </node>
     <node concept="3Tm1VV" id="3x8VOVH1smh" role="1B3o_S" />
   </node>
-  <node concept="2XOHcx" id="4rZeNQ6M9GV">
-    <property role="2XOHcw" value="${iets3.github.opensource.home}/code/languages/org.iets3.opensource" />
-  </node>
 </model>
 

code/languages/org.iets3.opensource/tests/test.org.iets3.analysis.base/models/[email protected]

@@ -14,9 +14,6 @@
   </imports>
   <registry>
     <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
-      <concept id="5097124989038916362" name="jetbrains.mps.lang.test.structure.TestInfo" flags="ng" index="2XOHcx">
-        <property id="5097124989038916363" name="projectPath" index="2XOHcw" />
-      </concept>
       <concept id="1216913645126" name="jetbrains.mps.lang.test.structure.NodesTestCase" flags="lg" index="1lH9Xt">
         <property id="2616911529524314943" name="accessMode" index="3DII0k" />
         <child id="1217501895093" name="testMethods" index="1SL9yI" />
@@ -514,8 +511,5 @@
       </node>
     </node>
   </node>
-  <node concept="2XOHcx" id="4rZeNQ6M9GV">
-    <property role="2XOHcw" value="${iets3.github.opensource.home}/code/languages/org.iets3.opensource" />
-  </node>
 </model>