[master] Merge branch 'trac5123'

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

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

diff --cc src/lib/dhcpsrv/parsers/dhcp_parsers.cc
Simple merge

diff --cc src/lib/dhcpsrv/parsers/dhcp_parsers.h
index ac7bc403b6d7907924584feb3d6ecd4e46df9bd9,7b2ec6c5b46d8e082f74233310e425a87497ee20..700864d9c8f4fe32be14cff4ccceaf391917f68e
--- 1/src/lib/dhcpsrv/parsers/dhcp_parsers.h
--- 2/src/lib/dhcpsrv/parsers/dhcp_parsers.h
+++ b/src/lib/dhcpsrv/parsers/dhcp_parsers.h
@@@ -932,15 -1028,20 +933,15 @@@ private
  
      /// @brief Returns a value converted to ReplaceClientNameMode
      ///
-     /// Instantiation of extractConvert() to ReplaceClientNameMode
+     /// Instantiation of getAndConvert() to ReplaceClientNameMode
      ///
-     /// @param value value of the parameter
+     /// @param scope specified parameter will be extracted from this scope
+     /// @param name name of the parameter
      /// @return a NameChangeFormat value
      D2ClientConfig::ReplaceClientNameMode
-     getMode(const std::string& name,
-             isc::data::ConstElementPtr value) const;
+     getMode(isc::data::ConstElementPtr scope, const std::string& name);
  };
  
 -// Pointers to various parser objects.
 -typedef boost::shared_ptr<BooleanParser> BooleanParserPtr;
 -typedef boost::shared_ptr<StringParser> StringParserPtr;
 -typedef boost::shared_ptr<Uint32Parser> Uint32ParserPtr;
 -
  }; // end of isc::dhcp namespace
  }; // end of isc namespace