Merge remote-tracking branch 'github/pr/1749'

diff --cc src/Makefile.am
Simple merge

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

diff --cc src/daemon/plugin.h
Simple merge

diff --cc src/exec.c
Simple merge

diff --cc src/utils_vl_lookup_test.c
Simple merge