[master] Merge branch 'trac5134_rebase'
# Conflicts: # src/bin/agent/Makefile.am # src/bin/agent/ca_cfg_mgr.cc # src/bin/agent/tests/.gitignore # src/bin/agent/tests/Makefile.am # src/bin/agent/tests/ca_cfg_mgr_unittests.cc # src/lib/process/tests/d_cfg_mgr_unittests.cc