Integrated: Merge jdk:master

Wed Sep 16 18:38:47 UTC 2020

On Wed, 16 Sep 2020 18:20:14 GMT, Kevin Rushforth <kcr at openjdk.org> wrote:

> Manually merge changes from the `jdk` repo.
> 
> Fix up the merge conflict in `.jcheck/conf` by taking the updated list of files to check for whitespace errors from the
> jdk and the rest of the file from lanai.

This pull request has now been integrated.

Changeset: 1553e9a1
Author:    Kevin Rushforth <kcr at openjdk.org>
URL:       https://git.openjdk.java.net/lanai/commit/1553e9a1
Stats:     90 lines in 6 files changed: 6 ins; 79 del; 5 mod

Merge jdk:master

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

PR: https://git.openjdk.java.net/lanai/pull/101