Merge change 20700

* changes:
  add gservices setting for switching sync subscriptions to use a new routing info.