[WFCORE-12] Further cleanup related to deployment-specific marshalling
Merge pull request #52 from bstansberry/WFCORE-12_2

[WFCORE-12] Further cleanup related to deployment-specific marshalling