Merge remote-tracking branch 'twstrike/procmon_tests'

 Conflicts:
	src/test/include.am
	src/test/log_test_helpers.c
	src/test/log_test_helpers.h

diff --cc src/test/include.am
Simple merge

diff --cc src/test/test.c
Simple merge