Merge "Tweak openssh settings"