Fix javadocs
Use maven plugin java5 annotations instead of javadoc annotations in mxcache-maven-plugin
Update guice version and guice integration tests