Merge branch 'os-detection'
false is an invalid value for PermitRootLogin
Merge branch 'permit-root-fix' into os-detection