Monkey patched issue with JMS Serialiser while we wait for a fix for https://github.com/schmittjoh/serializer/issues/216
Merge branch 'master' into APOLLO-2070