Jackson upgrade
Merge pull request #3665 from mkurz/jacksonUpgrade

Jackson upgrade