Updates for javadoc generation under JDK8