CMS-2321 Let the Form from the ContentType be saved together with the Content
Fixed problem with demo images not being created with the required form