Merge branch 'master' into cachedb-no-store

diff --cc cachedb/cachedb.c
Simple merge

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 4cc52cfb986fee9f9bc3c6f4d88467946082ae8f,6237d0c081561842e7030842a7494a0c4a3258ff..6363368e576514b5a36e389897125aceb4ef9185
--- 1/util/configparser.y
--- 2/util/configparser.y
+++ b/util/configparser.y
@@@ -3702,7 -3703,7 +3703,7 @@@ contents_cachedb: contents_cachedb cont
  content_cachedb: cachedb_backend_name | cachedb_secret_seed |
        redis_server_host | redis_server_port | redis_timeout |
        redis_expire_records | redis_server_path | redis_server_password |
-       cachedb_no_store
 -      redis_logical_db
++      cachedb_no_store | redis_logical_db
        ;
  cachedb_backend_name: VAR_CACHEDB_BACKEND STRING_ARG
        {