Merge remote-tracking branch 'origin/2018.2'

# Conflicts:
#	IdeaPlugin/mps-core/META-INF/plugin.xml
#	IdeaPlugin/mps-java/META-INF/plugin.xml
#	IdeaPlugin/mps-migration/META-INF/plugin.xml
#	IdeaPlugin/mps-vcs/META-INF/plugin.xml
#	build/mps.xml
#	build/mpsBootstrapCore.xml
#	plugins/debugger-api/runtime/jetbrains/mps/debugger/api/ui/actions.mps
#	plugins/debugger-api/runtime/source_gen/jetbrains/mps/debugger/api/ui/actions/plugin.xml
#	plugins/debugger-java/customViewers/models/jetbrains/mps/debugger/java/customViewers/plugin/plugin.mps
#	plugins/debugger-java/customViewers/source_gen/jetbrains/mps/debugger/java/customViewers/plugin/plugin/plugin.xml
#	plugins/execution-languages/languages/plugin/models/jetbrains/mps/execution/languages/plugin.mps
#	plugins/execution-languages/languages/plugin/source_gen/jetbrains/mps/execution/languages/plugin/plugin.xml
#	plugins/modelchecker/solution/modelchecker/actions.mps
#	plugins/modelchecker/source_gen/jetbrains/mps/ide/modelchecker/actions/plugin.xml
#	plugins/mps-build/META-INF/plugin.xml
#	plugins/mps-build/solutions/mpsBuild/models/build.mps
#	plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mps.xml
#	plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBootstrapCore.xml
#	plugins/mps-testing/META-INF/plugin.xml
#	plugins/mpsdevkit/solution/devkit/actions.mps
#	plugins/mpsdevkit/source_gen/jetbrains/mps/ide/devkit/actions/plugin.xml
#	plugins/mpsmake/make/actions.mps
#	plugins/mpsmake/source_gen/jetbrains/mps/ide/make/actions/plugin.xml
#	plugins/projectMigrations/META-INF/plugin.xml
#	plugins/vcs/solutions/jetbrains.mps.ide.vcs/models/jetbrains/mps/vcs/plugin.mps
#	plugins/vcs/solutions/jetbrains.mps.ide.vcs/source_gen/jetbrains/mps/vcs/plugin/plugin.xml
#	workbench/mps-workbench/jetbrains.mps.ide/models/actions.mps
#	workbench/mps-workbench/jetbrains.mps.ide/source_gen/jetbrains/mps/ide/actions/plugin.xml

Author: mvlassiev