Complete work on [JACKSON-756]; put 1/3 of fix to 2.0

1 file changed