Tiny tweak for 2.4: since additions really should only be in minor updates (2.5), let's not yet mark old method as deprecated here, to avoid compiler warnings (i.e. hiding the diff until 2.5)
Merge branch '2.4'

Conflicts:
	src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java