Merge "PostgreSQL: Improve dropping of foreign key constraint"