update version
update.xml
fix MPS-16867 Problem with introduce constant refactoring
when introduced constant is hided by local variable it is replaced as Class.const
add case to SimpleFindForIntroduceConstant
LocalVariableDeclaration provides scope for initializer
reference in ExtractMethodWithOutputVariable is created by createReference() method (not just LocalVariableReference)
fix LocalVariableReference->ParameterReference in Extract Method Tests
fix IntroduceConstantFromAnonimousClass
remove odd header comment in generated code
Merge remote-tracking branch 'remotes/origin/MPS2.5'

Conflicts:
	plugins/debugger-api/runtime/source_gen.caches/jetbrains/mps/debugger/api/ui/actions/generated
	plugins/debugger-java-customViewers/source_gen.caches/jetbrains/mps/debugger/java/customViewers/plugin/plugin/generated
	plugins/execution-configurations/languages/plugin/source_gen.caches/jetbrains/mps/execution/configurations/implementation/plugin/plugin/generated
	plugins/migration/solution/actions.mps
	plugins/migration/source_gen.caches/jetbrains/mps/ide/migration/actions/generated
	plugins/migration/source_gen/jetbrains/mps/ide/migration/actions/plugin.xml
	plugins/modelchecker/source_gen.caches/jetbrains/mps/ide/modelchecker/actions/generated
	plugins/mps-obsolete/languages/solutions/jetbrains.mps.buildlanguage.execution/source_gen.caches/jetbrains/mps/build/deprecated/execution/generated
	plugins/mpsdevkit/source_gen.caches/jetbrains/mps/ide/devkit/actions/generated
	plugins/mpsmake/source_gen.caches/jetbrains/mps/ide/make/actions/generated
	plugins/vcs/source_gen.caches/jetbrains/mps/vcs/plugin/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/actions/generated
Merge remote-tracking branch 'remotes/origin/MPS2.5'

Conflicts:
	languages/baseLanguage/baseLanguage/solutions/jetbrains.mps.baseLanguage.refactoringTest/jetbrains/mps/refactoringTest.mps
	languages/baseLanguage/baseLanguage/solutions/jetbrains.mps.baseLanguage.refactoringTest/source_gen.caches/jetbrains/mps/refactoringTest/generated
	languages/baseLanguage/baseLanguage/solutions/jetbrains.mps.baseLanguage.util/solution/refactorings.mps
	languages/baseLanguage/baseLanguage/solutions/jetbrains.mps.baseLanguage.util/source_gen.caches/jetbrains/mps/baseLanguage/util/plugin/refactorings/generated
	languages/baseLanguage/baseLanguage/solutions/jetbrains.mps.baseLanguage.util/source_gen/jetbrains/mps/baseLanguage/util/plugin/refactorings/trace.info
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/behavior/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/constraints/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/structure/dependencies
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/structure/generated
	languages/baseLanguage/baseLanguage/source_gen/jetbrains/mps/baseLanguage/behavior/trace.info
	languages/baseLanguage/baseLanguage/source_gen/jetbrains/mps/baseLanguage/structure/LocalVariableDeclaration.java
	languages/baseLanguage/baseLanguage/source_gen/jetbrains/mps/baseLanguage/structure/StructureAspectDescriptor.java
	languages/baseLanguage/baseLanguage/source_gen/jetbrains/mps/baseLanguage/structure/trace.info
Fix constraints checker test in SelectTest_Test root