Merge "Remove errant basicConfig calls in test suites" into feature/zuulv3