Fix #515
Merge branch '2.4'

Conflicts:
	src/test/java/com/fasterxml/jackson/databind/introspect/TestMixinMerging.java