Polishing
INTSAMPLES-127 Polishing

- PR Comments
- Switch to Jackson2
- Fix oxm config