Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Fix JDBC connection not terminated after project rename

Change-Id: I2e6efd46f8d8742d444316999ce1a6a8b8e235ed