Adapt javadoc for JDK 8

Javadoc tool in JDK 8 defaults are much more demanding
Merge another javadoc branch