Merge "Remove ZUUL_VOTING and add zuul.voting" into feature/zuulv3