merge: add support for s2k dummy generation

if a public key gets merged into a secret one, and there are new
subkeys, the merge() routine now adds a newly generated, stripped secret
subkey instead.
merge: adapt testcase to previous commit
editKey: add support for sripping keys
editKey: add test case for previous commit
add ui support for stripping subkeys