Resolved remaining issues with [JACKSON-103]

3 files changed