Merge "Remove need to start executor as root" into feature/zuulv3