Moving the roundRobinRoutingService back into core.

A bit of cleanup with the service as well