Merge "Fix missing logconfig when running tests in pycharm" into feature/zuulv3