Merge "Use display.display for executor debug messages" into feature/zuulv3