[Bug 226309] Merge Review: postgresql-jdbc