Merge "Use username from node information if available" into feature/zuulv3