[master] Merge branch 'trac5189'

# Conflicts:
#	src/bin/agent/ca_command_mgr.h
#	src/bin/agent/tests/ca_command_mgr_unittests.cc
#	src/lib/asiolink/testutils/test_server_unix_socket.cc

diff --cc src/lib/asiolink/testutils/test_server_unix_socket.cc
Simple merge