Merge branch '6592-website-edit-after-an-validations-error-example-write-xxx-into-quota-and-save-than' into 'develop'
Resolve "Website edit - after an validations error (example write xxx into Quota and save) than document_root is empty"
Closes #6692 and #6592
See merge request !1917
