More cleanup in collections-jdk8 and more JavaDoc fixes