UAVCANv1 Fix NodeClient header and Kconfig merge logic

Tools/kconfig/merge_config.py

@@ -110,10 +110,16 @@ def main(kconfig_file, config1, config2):
 
     for line in f:
         match = unset_match(line)
-        #pprint.pprint(match)
+        #pprint.pprint(line)
         if match is not None:
             sym_name = match.group(1)
             kconf.syms[sym_name].unset_value()
+
+            for default, cond in kconf.syms[sym_name].orig_defaults:
+                if(cond.str_value == 'y'):
+                    # Default is y, our diff is unset thus we've set it to no
+                    kconf.syms[sym_name].set_value(0)
+
     f.close()
 
     # Print warnings for symbols whose actual value doesn't match the assigned