Merge "Cleanup logging handlers" into feature/zuulv3