CMS-2170 Make ContentForm render existing content