Merge "PostgreSQL: Only rollback when in a transaction"