Cleanup javadoc to pass java 8 doclint checks