Fix javadoc compilation errors on jdk8
Merge pull request #1168 from nbelikov/1163_javadoc_for_jdk8

Fix JavaDoc compilation errors on JDK8