Ignore null values in vs*.option.* overrides.

In particular, if a value is set in this way only for some
configurations, it definitely shouldn't be reset and omitted in all
other configurations.