Merge change 2355

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