Merge remote-tracking branch 'origin/pr/1135'

diff --cc src/Makefile.am
Simple merge

diff --cc src/daemon/common_test.c
Simple merge

diff --cc src/daemon/utils_subst_test.c
Simple merge

diff --cc src/utils_mount_test.c
Simple merge

diff --cc src/utils_vl_lookup.c
Simple merge