[sealed-types] [Rev 02] RFR: Merge master

[J.Duke]

> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 86 commits from the branch `master`that
> can **not** be merged into the branch `sealed-types`:
> The following files contains merge conflicts:
> 
> - make/data/jdwp/jdwp.spec
> - src/java.instrument/share/classes/java/lang/instrument/Instrumentation.java
> - src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java
> - src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java
> 
> All Committers in this [project](https://openjdk.java.net/census#Optional[amber]) have access to my [personal
> fork](https://github.com/openjdk-bot/amber) and can therefore help resolve these merge conflicts (you may want to
> coordinate who should do this). The following paragraphs will give an example on how to solve these merge conflicts and
> push the resulting merge commit to this pull request. The below commands should be run in a local clone of your
> [personal fork](https://wiki.openjdk.java.net/display/skara#Skara-Personalforks) of the
> [openjdk/amber](https://github.com/openjdk/amber) repository.  # Ensure target branch is up to date $ git checkout
> sealed-types $ git pull https://github.com/openjdk/amber sealed-types
> 
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/amber +42:openjdk-bot-42
> $ git checkout openjdk-bot-42
> 
> # Merge the target branch
> $ git merge sealed-types
> 
> When you have resolved the conflicts resulting from the `git merge` command above, run the following commands to create
> a merge commit:
> $ git add paths/to/files/with/conflicts
> $ git commit -m 'Merge master'
> 
> 
> When you have created the merge commit, run the following command to push the merge commit to this pull request:
> 
> $ git push https://github.com/openjdk-bot/amber openjdk-bot-42:42
> 
> _Note_: if you are using SSH to push commits to GitHub, then change the URL in the above `git push` command accordingly.
> 
> Thanks,
> J. Duke

J. Duke has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes
the unrelated changes brought in by the merge/rebase.

This pull request has now been integrated.

Changeset: 3d2961e6
Author:    Vicente Romero <vicente.romero at oracle.com>
URL:       https://git.openjdk.java.net/amber/commit/3d2961e6
Stats:     35 lines in 1 file changed: 35 ins; 0 del; 0 mod

fixing merge issue on HtmlStyle

-------------

Changes:
  - all: https://git.openjdk.java.net/amber/pull/22/files
  - new: https://git.openjdk.java.net/amber/pull/22/files/71add502..3d2961e6

Webrevs:
 - full: https://webrevs.openjdk.java.net/amber/22/webrev.02
 - incr: https://webrevs.openjdk.java.net/amber/22/webrev.01-02

  Stats: 35 lines in 1 file changed: 0 ins; 35 del; 0 mod
  Patch: https://git.openjdk.java.net/amber/pull/22.diff
  Fetch: git fetch https://git.openjdk.java.net/amber pull/22/head:pull/22

PR: https://git.openjdk.java.net/amber/pull/22