Merge "Add new multi ssh configuration options"