CMS-3216 Form problems when form is used outside of "content-type" step