Update changelog
Actually apply the javadocHotfix plugin
Merge branch 'master' into SpringFramework4

* master:
  Actually apply the javadocHotfix plugin
  Update changelog