Trying to diagnose test failure occurring with a newer core dep, but only if I run tests for the whole plugin, not just this test case or even test suite by itself.
Updated to 1.557, mainly to verify workaround to XSTR-757.
Merge branch 'master' into SCM-Job

Conflicts:
	pom.xml