CONN-911: Fix for marshaller external entity injection.
Merge pull request #708 from msweaver/CONN-911

CONN-911: Fix for marshaller external entity injection.