get rid of more getMasterKeyId usage, work on getKeyRingsAsArmoredString
split getMasterKeyId for the remaining use cases

Closes #549