added ssh-keygen shim
Merge branch 'ssh-keygen-shim'