Merge branch 'stable-2.12' into stable-2.13

* stable-2.12:
  Fix Postgresql JDBC driver leaking memory

Change-Id: I34530c9736f471d67ac761cb591443202b597e5a