Merge pull request #10404 from chadmoone/fix-pg-uuid-default

Allow override of PostgreSQL UUID primary key default