Merge "sshd template, rename hiera key"