Javadoc 1.8 error fixes
Merge pull request #1545 from scop/javadoc8

Javadoc 1.8 error fixes