Merge "Fix NoSuchOptError wrt CONF.validation.ssh_key_type"