Merge "Make executor hostname configurable" into feature/zuulv3