Merge "Make test testStopRecur in test 1934 not throw SOEs"