Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Do not reject commit upon connectivity problems

Change-Id: Ie4a844b61782f0b8118d0014696ad933a60820a2