Fixes for JAXB channel deserialisation.
Merge branch 'mbst-5575-channel-config-from-atlas' into stage