Merge "Add support to chose ssh key type"