Merge branch 'IBM-jackson-upgrade' into 'master'

Shrikant Gargrequested to merge
cherry-pick-a6fbc8fb-2 into release/0.16

Original MR: !242 (merged)

Edited by David Diederich

Merge request reports