Merge change 6855 into donut

* changes:
  Add a Gservices setting to control if we send up multipart protocol buffers