Merge pull request #407 from mvo5/tweak-root-ssh-keys

Merge pull request #407 from mvo5/tweak-root-ssh-keys #269