[java-sig-commits] [Bug 1296926] Unable to build after rebase to PostgreSQL 9.5