MPS-19374 - checking for null added
Merge remote-tracking branch 'origin/MPS3.0' into 3.0/vaclavFixes
Rebuilt
Fix MPS-19383 Some code using java generics is not correctly processed by MPS
Merge branch 'MPS3.0' into 3.1/vaclavMerge2

Conflicts:
	languages/baseLanguage/baseLanguage/languageModels/behavior.mps
	languages/baseLanguage/baseLanguage/source_gen/jetbrains/mps/baseLanguage/behavior/ClassifierType_Behavior.java
Merge branch 'MPS3.0' into 3.1/vaclavMerge2

Conflicts:
	languages/baseLanguage/baseLanguage/languageModels/behavior.mps
	languages/baseLanguage/baseLanguage/source_gen/jetbrains/mps/baseLanguage/behavior/ClassifierType_Behavior.java
Rebuilt