ssh: Add m8; update cipher for VPN hosts
Merge branch 'master' into glue