RFR: JDK-8293093 NPE in P11KeyStore.getID

[Mark Powers]

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

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

Commit messages:
 - Merge
 - second iteration
 - first iteration

Changes: https://git.openjdk.org/jdk/pull/10823/files
 Webrev: https://webrevs.openjdk.org/?repo=jdk&pr=10823&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8293093
  Stats: 6 lines in 1 file changed: 0 ins; 0 del; 6 mod
  Patch: https://git.openjdk.org/jdk/pull/10823.diff
  Fetch: git fetch https://git.openjdk.org/jdk pull/10823/head:pull/10823

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