Merge "Add zuul supplementary groups before setgid/setuid" into feature/zuulv3