Updated AspectJ
trivial javadoc updates
Merge branch '2.3.x'

Conflicts:
	build.gradle