Upstream changes: 2.005001 - 2018-04-20 - add a workaround for test failures on early 5.8 releases with threads
32a67149a7