Fix javadoc errors for building with Java SE 8
Merge pull request #1601 from KovuTheHusky/master

Fix javadoc errors for building with Java SE 8