Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: I5f72c9b38980c1979d92df3b3a7f17f42d4807f8