Merge branch 'jt/config-lock-timeout' into seen

The code path to update the configuration file has been taught to
use a short timeout to retry.

* jt/config-lock-timeout:
  config: retry acquiring config.lock for 100ms

diff --cc config.c
Simple merge