Merge branch 'lp/config-vername-check' into maint

* lp/config-vername-check:
Disallow empty section and variable names
Sanity-check config variable names

diff --cc builtin/config.c
Simple merge

diff --cc cache.h
Simple merge

diff --cc config.c
Simple merge