Merge "Switch to ssh proto in defaul contexts - w\o user set"