Merge remote-tracking branch 'origin/master' into deliver_pid

diff --cc src/common/database/depinfo_db_handler.cc
Simple merge

diff --cc src/common/database/pkg_set_db_handler.cc
Simple merge

diff --cc src/common/request_handler/set_cert_request_handler.cc
Simple merge

diff --cc test/unit_tests/test_database.cc
Simple merge