Replaced ssh-ident with generic ssh-agent where possible