RFR: JDK-8259395 Patching automatic module with additional packages re-creates module without "requires java.base"

[Johannes Kuhn]

Simple fix, complex test case.

Thanks to @AlanBateman for pointing out the right fix.

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

Commit messages:
 - * Minor cleanup.
 - * Fix Whitespace V2
 - * Fix whitespace
 - * Fix JDK-8259395 - test now passes
 - Merge branch 'master' of https://github.com/openjdk/jdk into JDK-8259395
 - * Add failing tests for JDK-8259395

Changes: https://git.openjdk.java.net/jdk/pull/2000/files
 Webrev: https://webrevs.openjdk.java.net/?repo=jdk&pr=2000&range=00
  Issue: https://bugs.openjdk.java.net/browse/JDK-8259395
  Stats: 142 lines in 4 files changed: 140 ins; 0 del; 2 mod
  Patch: https://git.openjdk.java.net/jdk/pull/2000.diff
  Fetch: git fetch https://git.openjdk.java.net/jdk pull/2000/head:pull/2000

PR: https://git.openjdk.java.net/jdk/pull/2000