BZ-1002586: Saving the ContentMarshalerContext on a custom component to avoid serialization conflicts on eap.
Merge branch '6.0.x' of https://github.com/droolsjbpm/jbpm-form-modeler into 6.0.x