[Pki-devel] Patch for review - Fix Java class conflicts when using Java 7 . . .