Merge "bug 36087: PostgresUpdater fails on 8.3.14"