GitLab

Conflicts:
	src/lib/dhcpsrv/alloc_engine.cc
	src/lib/dhcpsrv/alloc_engine.h
	src/lib/dhcpsrv/tests/alloc_engine4_unittest.cc

Pulling new changes into my branch to commit typo level fixes

The .xml file is not a generated file.

problem was noticed by wlodek (and reproduced by me):

  make[4]: Entering directory
  `/home/wlodek/dev/ktest/src/bin/keactrl'

  /home/wlodek/dev/kea_test/tools/path_replacer.sh
  /home/wlodek/dev/kea_test/src/bin/keactrl/kea.conf.pre kea.conf

  /bin/bash: /home/wlodek/dev/kea_test/tools/path_replacer.sh: No
  such file or directory

This prevents failure of the CondVar unit tests which expect that the
pthread_cond_destroy returns error code if the other thread is blocked
on the conditional variable which is being destroyed.

Remove another unused variable in memfile_ubench.cc

Actually use the trimmed variable in host.cc

Update commetns in process_spawn.[cc h]