Automatic merge of jdk:master into master

Author: duke

test/langtools/jdk/javadoc/doclet/testLinkOption/TestRedirectLinks.java

@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 8190312
+ * @key intermittent
  * @summary test redirected URLs for -link
  * @library /tools/lib ../../lib /test/lib
  * @modules jdk.compiler/com.sun.tools.javac.api