[3422] Merge branch 'master' into trac3422

diff --cc src/bin/dhcp4/dhcp4_messages.mes
Simple merge

diff --cc src/bin/dhcp6/tests/dhcp6_reconfigure_test.sh
index 72f216f908a380329588d4e092853b800f456704,fc0cfc196c575012505243570a5e5350013ce5e5..97dadcbf340f7fa434725bbea101d5dbe0d979be
--- 1/src/bin/dhcp6/tests/dhcp6_reconfigure_test.sh
--- 2/src/bin/dhcp6/tests/dhcp6_reconfigure_test.sh
+++ b/src/bin/dhcp6/tests/dhcp6_reconfigure_test.sh
@@@ -88,9 -88,10 +88,10 @@@ f
  
  # Check if it is still running. It could have terminated (e.g. as a result
  # of configuration failure).
 -get_pids
 +get_pids ${BIN}
  if [ ${_GET_PIDS_NUM} -ne 1 ]; then
-     printf "ERROR: expected one Kea process to be started. Found %d processes started.\n" ${_GET_PIDS_NUM}
+     printf "ERROR: expected one Kea process to be started. Found %d processes\
+  started.\n" ${_GET_PIDS_NUM}
      clean_exit 1
  fi
  

diff --cc src/bin/dhcp6/tests/dhcp6_shutdown_test.sh
index 8a342d2a599a1a92425d69d429a5d037a674411c,958b6d966a7290226fb4249133f537eeb57ec45a..f1f8dcc4ab9cdf6e24de1b99d648561ad6b6f1a7
--- 1/src/bin/dhcp6/tests/dhcp6_shutdown_test.sh
--- 2/src/bin/dhcp6/tests/dhcp6_shutdown_test.sh
+++ b/src/bin/dhcp6/tests/dhcp6_shutdown_test.sh
@@@ -73,9 -73,10 +73,10 @@@ f
  
  # Check if it is still running. It could have terminated (e.g. as a result
  # of configuration failure).
 -get_pids
 +get_pids ${BIN}
  if [ ${_GET_PIDS_NUM} -ne 1 ]; then
-     printf "ERROR: expected one Kea process to be started. Found %d processes started.\n" ${_GET_PIDS_NUM}
+     printf "ERROR: expected one Kea process to be started. Found %d processes\
+  started.\n" ${_GET_PIDS_NUM}
      clean_exit 1
  fi
  
@@@ -101,9 -102,10 +102,10 @@@ if [ ${_WAIT_FOR_MESSAGE} -eq 0 ]; the
  fi
  
  # Server should have shut down.
 -get_pids
 +get_pids ${BIN}
  if [ ${_GET_PIDS_NUM} -ne 0 ]; then
-     printf "ERROR: Kea did not shut down after receiving signal.\n" ${_GET_PIDS_NUM}
+     printf "ERROR: Kea did not shut down after receiving signal.\n"\
+  ${_GET_PIDS_NUM}
      clean_exit 1
  fi
  

diff --cc src/lib/testutils/dhcp_test_lib.sh
index 3992fcb39e118aa0f57971b6c06c56c98ac90c2b,b6656b514288754dbcbb8cf0844670a7631b78ec..85bba3c9f3c9bac1a2c4cc9547b7a20fe4c5a101
--- 1/src/lib/testutils/dhcp_test_lib.sh
--- 2/src/lib/testutils/dhcp_test_lib.sh
+++ b/src/lib/testutils/dhcp_test_lib.sh
@@@ -206,12 -178,12 +206,13 @@@ wait_for_message() 
  
  # Sends specified signal to the Kea process.
  send_signal() {
 -    sig=${1}  # Signal number.
 +    sig=${1}       # Signal number.
 +    proc_name=${2} # Process name
      # Get Kea pid.
 -    get_pids
 +    get_pids ${proc_name}
      if [ ${_GET_PIDS_NUM} -ne 1 ]; then
-         printf "ERROR: expected one Kea process to be started. Found %d processes started.\n" ${_GET_PIDS_NUM}
+         printf "ERROR: expected one Kea process to be started.\
+  Found %d processes started.\n" ${_GET_PIDS_NUM}
          clean_exit 1
      fi
      printf "Sending signal ${sig} to Kea process (pid=%s).\n" ${_GET_PIDS}