Whops! Was actually able to complete [JACKSON-756] fix for 1.9 as well as 2.x...

6 files changed