QENG-1538 EOS hack fix

This is dependent on [sshkeys PR 70](https://github.com/puppetlabs/puppetlabs-sshkeys/pull/70).

Don't worry about considering this for merge or testing until then.

It's also dependent and based off of the changes for #553, so this will look like a large diff until that is merged, it's really a small one.