Avoid overwriting known values with blank data

Don't clear known values unless we explicitly pass through NULL as the
value. This fixes known values from higher whois records being cleared.
Merge remote-tracking branch 'origin/template_fixes'