Merge "Fix Maven Javadoc generation problem"