Fix JavaDoc to comply with Java8 doc lint