Finished cleaning up rebase conflicts post Keyserver exception refactor