MPS-17210: fix merge and find for text files
Merge branch 'mvtest30'
Fix diff test
Fix constraints tests