CMS-1209 Fix buggy conversion of MixinReferences to FormItems