JavaDoc changes to permit build with JDK 8