MPS-19190 Console falls with exception when loading history of unrecognized format
MPS-19289 After exception during mergedriver's merge the model can be empty in MPS
Merge remote-tracking branch 'origin/MPS3.0'

Conflicts:
	plugins/console/models/jetbrains/mps/console/tool.mps
	plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleTool.java
	plugins/vcs-core/core/source_gen/jetbrains/mps/vcs/core/mergedriver/FileMerger.java
make