Don't make RoundRobin use a CyclicCounter when there's only one value, backport #1205