Merge "Always reevaluate rules when a new service is added." into nyc-dev