[master] Merge branch 'trac3785'

diff --cc src/bin/keactrl/keactrl.in
index 129a7e74e21a8c392df2294fb624e9b9afc37263,594459f0407ff4e62588f4b35b126a25c0ae5869..5e422560e99bddb0e437d72b4df72d92d6da11a0
--- 1/src/bin/keactrl/keactrl.in
--- 2/src/bin/keactrl/keactrl.in
+++ b/src/bin/keactrl/keactrl.in
@@@ -371,19 -307,23 +378,23 @@@ case ${command} i
  
      # Stop running servers.
      stop)
+         check_kea_conf ${kea_config_file}
+ 
          # Stop all servers or servers specified from the command line.
 -        run_conditional "dhcp4" "send_signal 15 $(basename ${dhcp4_srv})" 0
 -        run_conditional "dhcp6" "send_signal 15 $(basename ${dhcp6_srv})" 0
 -        run_conditional "dhcp_ddns" "send_signal 15 $(basename ${dhcp_ddns_srv})" 0
 +        run_conditional "dhcp4" "stop_server ${dhcp4_srv}" 0
 +        run_conditional "dhcp6" "stop_server ${dhcp6_srv}" 0
 +        run_conditional "dhcp_ddns" "stop_server ${dhcp_ddns_srv}" 0
  
          exit 0 ;;
  
      # Reconfigure the servers.
      reload)
+         check_kea_conf ${kea_config_file}
+ 
          # Reconfigure all servers or servers specified from the command line.
 -        run_conditional "dhcp4" "send_signal 1 $(basename ${dhcp4_srv})" 0
 -        run_conditional "dhcp6" "send_signal 1 $(basename ${dhcp6_srv})" 0
 -        run_conditional "dhcp_ddns" "send_signal 1 $(basename ${dhcp_ddns_srv})" 0
 +        run_conditional "dhcp4" "reload_server ${dhcp4_srv}" 0
 +        run_conditional "dhcp6" "reload_server ${dhcp6_srv}" 0
 +        run_conditional "dhcp_ddns" "reload_server ${dhcp_ddns_srv}" 0
  
          exit 0 ;;