Merge change I4ff96000 into eclair-mr2

* changes:
  new gservices flag for delaying bad gmail operations