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
#4237 type() instead of permissionType()
Merge pull request #4238 from dotCMS/issue-4237-broken-fileasset-upgrade

#4237 type() instead of permissionType()
#4232
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
#4255
Merge remote-tracking branch 'origin' into issue-3831-make-rest-content-save-allow-front-end-saving
indentation #3831
missing import
#4258
#4269
fixes #4263