CMS-2297 Remove builders from data.Property and data.Value
Removed builders from Property
CMS-2321 Let the Form from the ContentType be saved together with the Content