Fix #635
Merge branch '2.4'

Conflicts:
	pom.xml
	release-notes/VERSION
	src/main/java/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java