Merge change 2492 into donut

* changes:
  add Gservices setting for "send message using bareJid timeout".