Merge branch 'stable-3.0' into stable-3.3

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

Change-Id: I0822bc4d34f24565d3b0c30bc5d981ac8d1a1d7e