Merge branch 'gc/config-partial-submodule-kvi-fix'

Partially revert a sanity check that the rest of the config code
was not ready, to avoid triggering it in a corner case.

* gc/config-partial-submodule-kvi-fix:
  config: don't BUG when both kvi and source are set

diff --cc config.c
Simple merge