[4096] Merge branch 'master' into trac4096

    Eval library now supports actual parsing.  Need to use it
    in class definition's ExpressionParser.

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

diff --cc src/bin/dhcp4/tests/config_parser_unittest.cc
Simple merge

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

diff --cc src/bin/dhcp6/tests/config_parser_unittest.cc
Simple merge

diff --cc src/lib/dhcpsrv/client_class_def.h
index 78a65fee92696d897393820401918df2103b6e4a,722fcfe22ed7d1cf74ce2c2eb5202369277d7d2e..8534395c9055caeb0bc5ebc75eac631dcf5a6655
--- 1/src/lib/dhcpsrv/client_class_def.h
--- 2/src/lib/dhcpsrv/client_class_def.h
+++ b/src/lib/dhcpsrv/client_class_def.h
@@@ -132,12 -111,9 +132,12 @@@ typedef boost::shared_ptr<ClientClassDe
  /// @brief Defines a map of ClientClassDef's, keyed by the class name.
  typedef std::map<std::string,ClientClassDefPtr> ClientClassDefMap;
  
- /// @brief Defines a pointer to a ClientClassDictionary
+ /// @brief Defines a pointer to a ClientClassDefMap
  typedef boost::shared_ptr<ClientClassDefMap> ClientClassDefMapPtr;
  
 +/// @brief Defines a pair for working wiht ClientClassMap
 +typedef std::pair<std::string,ClientClassDefPtr> ClientClassMapPair;
 +
  /// @brief Maintains a list of ClientClassDef's
  class ClientClassDictionary {
  

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