Merge branch 'stable-2.11' into stable-2.12

* stable-2.11:
  Fix Postgresql JDBC driver leaking memory

Change-Id: Ie4c0ff60f098fbc606aba56a027ff8a0884e3a5d