Remove dead code
Replace PropertiesCollector with AnnotationIntrospector
Merge branch '2.5' into annotation-introspector-2.4

Conflicts:
	version.sbt
Final fixups
Merge branch 'annotation-introspector'