Do not remove matching options from tripped user config.

Instead, add an extra line with comment "CONFIG_* matches distro" to
mark such options. This removes false positives for the dist_new_options
part of --diff. Also updating the user config will no longer require the
combined config - the trimmed user config can now be used for make
oldconfig directly.