Merge "Re-enable test_nonvoting_job" into feature/zuulv3