RFR: JDK-8291509 Minor cleanup could be done in sun.security

[Mark Powers]

https://bugs.openjdk.org/browse/JDK-8291509

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

Commit messages:
 - Merge
 - fourth iteration
 - third iteration
 - mismerge
 - Merge
 - second iteration
 - first iteration

Changes: https://git.openjdk.org/jdk/pull/9972/files
 Webrev: https://webrevs.openjdk.org/?repo=jdk&pr=9972&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8291509
  Stats: 4088 lines in 307 files changed: 378 ins; 767 del; 2943 mod
  Patch: https://git.openjdk.org/jdk/pull/9972.diff
  Fetch: git fetch https://git.openjdk.org/jdk pull/9972/head:pull/9972

PR: https://git.openjdk.org/jdk/pull/9972