--- jsr166/build.xml	2016/09/25 01:28:54	1.220
+++ jsr166/build.xml	2016/10/10 04:51:19	1.222
@@ -336,6 +336,7 @@
            reportDir="@{workdir}/JTreport">
       <patternset refid="jdk@{target}.jtreg.tests"/>
       <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
+      <arg value="-javacoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
       <arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
       <arg value="-agentvm"/>
       <arg value="-verbose:${jtreg.verbose}"/>
@@ -455,11 +456,11 @@
       <arg value="${javadoc.jls.option}"/>
 <!-- @apiNote currently unused -->
 <!--       <arg value="-tag"/> -->
-<!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
+<!--       <arg value="apiNote:a:API Note:"/> -->
       <arg value="-tag"/>
-      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
+      <arg value="implSpec:a:Implementation Requirements:"/>
       <arg value="-tag"/>
-      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
+      <arg value="implNote:a:Implementation Note:"/>
 <!-- tags added in jdk9: currently unused -->
 <!--       <arg value="-tag"/> -->
 <!--       <arg value="revised:X"/> -->