Merge "PostgreSQL: Drop unneeded foreign key constraint"