JBTM-1536 XTS default-context-propagation must be optional to maintain backwards compatability