Merge branch 'master' into cachedb-no-store

diff --cc util/config_file.c
Simple merge

diff --cc util/config_file.h
Simple merge

diff --cc util/configlexer.lex
Simple merge

diff --cc util/configparser.y
index 6363368e576514b5a36e389897125aceb4ef9185,ef55216adb11784bc8f543adf400accaa3215707..da5d6608f1d5fa0ae8c7a562a797dd319c85e363
--- 1/util/configparser.y
--- 2/util/configparser.y
+++ b/util/configparser.y
@@@ -199,7 -199,7 +199,7 @@@ extern struct config_parser_state* cfg_
  %token VAR_INTERFACE_ACTION VAR_INTERFACE_VIEW VAR_INTERFACE_TAG
  %token VAR_INTERFACE_TAG_ACTION VAR_INTERFACE_TAG_DATA
  %token VAR_PROXY_PROTOCOL_PORT VAR_STATISTICS_INHIBIT_ZERO
- %token VAR_HARDEN_UNKNOWN_ADDITIONAL VAR_CACHEDB_NO_STORE
 -%token VAR_HARDEN_UNKNOWN_ADDITIONAL VAR_DISABLE_EDNS_DO
++%token VAR_HARDEN_UNKNOWN_ADDITIONAL VAR_DISABLE_EDNS_DO VAR_CACHEDB_NO_STORE
  
  %%
  toplevelvars: /* empty */ | toplevelvars toplevelvar ;