back-porting fix for MPS-18718
Merge remote-tracking branch 'origin/MPS2.5' into MPS3.0

Conflicts:
	editor/editor-runtime/source/jetbrains/mps/nodeEditor/inspector/InspectorEditorComponent.java