Bit more testing, cleanup
Merge branch '2.4'

Conflicts:
	src/main/java/com/fasterxml/jackson/datatype/guava/GuavaSerializers.java