Fix Javadoc for compliance with Java 8 standards

This PR contains fix for Javadoc to be in compliance with Java 8 standards