Tweak handing of null during config merge.

Previously it would result in keys being deleted. Now we leave
the null in place, and expect calling code to deal with it gracefully.
This helps some corner-cases when merging sibling config files.
Guard against calling Object.keys(null)