Merge pull request #2668 from soc/SI-7292-fix

SI-7292 Fixes test failures by updating *.check files
SI-6811 Split scala.util.parsing and move it to its own jar