[master] Finished merge of trac2358a (DBGLVL_xxx)

diff --cc src/bin/agent/ca_process.cc
index 085fe01d3f3d8b0cf08a0cd7f39b3fb63d5d4a0c,99cb6769d2bb3884b851ccaf1cfe07f77d4c34a8..1fa08731e7b47baaee4915256031cb1717cfc37a
--- 1/src/bin/agent/ca_process.cc
--- 2/src/bin/agent/ca_process.cc
+++ b/src/bin/agent/ca_process.cc
@@@ -107,17 -99,7 +107,17 @@@ CtrlAgentProcess::run() 
                    "Process run method failed: " << ex.what());
      }
  
-     LOG_DEBUG(agent_logger, DBGLVL_START_SHUT, CTRL_AGENT_RUN_EXIT);
 +    try {
 +        // Deregister commands.
 +        CtrlAgentControllerPtr controller =
 +            boost::dynamic_pointer_cast<CtrlAgentController>(
 +                CtrlAgentController::instance());
 +        controller->deregisterCommands();
 +    } catch (const std::exception&) {
 +        // What to do? Simply ignore...
 +    }
 +
+     LOG_DEBUG(agent_logger, isc::log::DBGLVL_START_SHUT, CTRL_AGENT_RUN_EXIT);
  }
  
  isc::data::ConstElementPtr

diff --cc src/bin/d2/d2_process.cc
Simple merge

diff --cc src/lib/process/d_controller.cc
index ce26520926d68f186dd426c408049e7afdb9ee03,51f7c7ee037f6e777115fe4f5186d219c9d75832..18f3b0484291e2b5f6e03383eab0bc788d55ce12
--- 1/src/lib/process/d_controller.cc
--- 2/src/lib/process/d_controller.cc
+++ b/src/lib/process/d_controller.cc
@@@ -500,10 -515,10 +503,10 @@@ DControllerBase::processSignal(int sign
          case SIGINT:
          case SIGTERM:
          {
-             LOG_DEBUG(dctl_logger, DBGLVL_START_SHUT,
+             LOG_DEBUG(dctl_logger, isc::log::DBGLVL_START_SHUT,
                        DCTL_SHUTDOWN_SIGNAL_RECVD).arg(signum);
 -            isc::data::ElementPtr arg_set;
 -            executeCommand(SHUT_DOWN_COMMAND, arg_set);
 +            ElementPtr arg_set;
 +            shutdownHandler(SHUT_DOWN_COMMAND, arg_set);
              break;
          }