test and fix: adding an empty user id should fail
tests: add a couple of UncachedKeyRing.merge tests
fixes for extractPublicKeyRing, update SpongyCastle
UncachedKeyRing.merge: copy over new secret subkeys into secret keyrings
Merge remote-tracking branch 'origin/master'