Updates for 2.5.x and adding an implied JsonCreator when it is appropriate.