Merge "Re-add the ability to set username on zuul-executor" into feature/zuulv3