Merge "Consolidate the ssh code"