[master] Finishing merge of trac5449 (Fixes from analyzers)

diff --cc src/bin/dhcp4/dhcp4_srv.cc
Simple merge

diff --cc src/bin/dhcp6/dhcp6_srv.cc
Simple merge

diff --cc src/lib/cc/data.h
index d959a9684cb2457f3f061fb4477f0482401591e2,e8b225593f35c41928af2b677d1eb28cfae1db5b..2730a1a791674e1196180d337b2377323bc2e4ed
--- 1/src/lib/cc/data.h
--- 2/src/lib/cc/data.h
+++ b/src/lib/cc/data.h
@@@ -1,4 -1,4 +1,4 @@@
--// Copyright (C) 2010-2017 Internet Systems Consortium, Inc. ("ISC")
++// Copyright (C) 2010-2018 Internet Systems Consortium, Inc. ("ISC")
  //
  // This Source Code Form is subject to the terms of the Mozilla Public
  // License, v. 2.0. If a copy of the MPL was not distributed with this
@@@ -437,9 -437,9 +437,10 @@@ public
      /// @param file_name specified input file name (used in error reporting)
      /// @param preproc specified whether preprocessing (e.g. comment removal)
      ///                should be performed
+     /// @throw JSONError
      /// @return An ElementPtr that contains the element(s) specified
      /// in the given input stream.
 +    /// @throw JSONError
      static ElementPtr fromJSON(std::istream& in, const std::string& file_name,
                                 bool preproc = false);
  

diff --cc src/lib/dhcp/pkt6.cc
Simple merge

diff --cc src/lib/eval/eval_context.cc
Simple merge