Fixes #6601 : Can't upgrade from the last 2.5.6 to 3.0 in PostgreSQL
Merge pull request #6604 from dotCMS/issue-6601-cant-upgrade-from-2_5_6-to-3_0-postgres

Fixes #6601 : Can't upgrade from the last 2.5.6 to 3.0 in PostgreSQL
Fixes #6585
Merge pull request #6606 from dotCMS/issue-6585-changing-theme-designed-template

Fixes #6585
Merge remote-tracking branch 'origin/master' into issue-6595-server-action