Merge change 4977 into donut

* changes:
  Update the gservices gtalk setting for the terms and services url.