CMS-2321 Let the Form from the ContentType be saved together with the Content
Temporary fix for problem with forms containing Layout