fix keyring problem with imports
Merge remote-tracking branch 'kali/bug/workaround_keyring_imports' into develop