Merge "Revert "Make all functional jobs non-voting""