Merge remote-tracking branch 'origin/develop' into xap

lib/python/qmk/cli/info.py

@@ -24,7 +24,6 @@ def _strip_api_content(info_json):
     info_json.pop('platform_key', None)
     info_json.pop('processor_type', None)
     info_json.pop('protocol', None)
-    info_json.pop('config_h_features', None)
     info_json.pop('keymaps', None)
     info_json.pop('keyboard_folder', None)
     info_json.pop('parse_errors', None)

lib/python/qmk/info.py

@@ -324,9 +324,6 @@ def _extract_features(info_data, rules):
             if key in ['lto']:
                 continue
 
-            if 'config_h_features' not in info_data:
-                info_data['config_h_features'] = {}
-
             if 'features' not in info_data:
                 info_data['features'] = {}
 
@@ -334,7 +331,6 @@ def _extract_features(info_data, rules):
                 _log_warning(info_data, 'Feature %s is specified in both info.json (%s) and rules.mk (%s). The rules.mk value wins.' % (key, info_data['features'], value))
 
             info_data['features'][key] = value
-            info_data['config_h_features'][key] = value
 
     return info_data