Originally spelled out in ISPN-6498, these JIRA focuses on those minor marshalling improvements that can be quickly integrated, allowing bigger pieces of work to more easily be applied:

• Remove CacheMarshaller/GlobalMarshaller differentiation.
• Get rid of VersionAwareMarshaller.
• Remove AdvancedCache.with(Classloader) method (see http://lists.jboss.org/pipermail/infinispan-dev/2016-July/016738.html)