ISPN-3526 Inject dependecies into the marshaller used for compatibility ...

...mode

Also cleanup related tests.

Jira: https://issues.jboss.org/browse/ISPN-3526

Please integrate in master.