Merge proposals

openssh-known-hosts in Ubuntu has no merge proposals.