Merge "fix javadoc task on JDK7"