first commit #3831
Merge remote-tracking branch 'origin' into issue-3831-make-rest-content-save-allow-front-end-saving
Merge remote-tracking branch 'origin' into issue-3831-make-rest-content-save-allow-front-end-saving
#4218 added the fields just before they're needed
Merge pull request #4229 from dotCMS/issue-4218-upgrade-from-19-broke

#4218 added the fields just before they're needed
#4228 get description only if contentlet
Merge pull request #4236 from dotCMS/issue-4228-legacy-files-broken

#4228 get description only if contentlet
#4237 type() instead of permissionType()
Merge pull request #4238 from dotCMS/issue-4237-broken-fileasset-upgrade

#4237 type() instead of permissionType()
#3880 generated basic hibernate DDL
#3880 ignore the generated sql file
#4232
#3880 done generating all the sql. just lack triggers
Merge remote-tracking branch 'origin' into issue-3831-make-rest-content-save-allow-front-end-saving
#4243
#3831
#4242
fixes #4177 All archived content does not display
Merge pull request #4256 from dotCMS/issue-4177-all-archived-content-does-not-display

fixes #4177 All archived content does not display
fixes #4248