[4096] Pull in changes from Francis

Merge branch 'trac4096' of ssh://git.kea.isc.org/git/kea into trac4096

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

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

diff --cc src/lib/dhcpsrv/client_class_def.h
index 8534395c9055caeb0bc5ebc75eac631dcf5a6655,22e52deee1999e5221eb5e28b1745561cf12e55b..843320c1d1d02a3f0643a62fdf7bbacfff75d463
--- 1/src/lib/dhcpsrv/client_class_def.h
--- 2/src/lib/dhcpsrv/client_class_def.h
+++ b/src/lib/dhcpsrv/client_class_def.h
@@@ -130,13 -130,13 +130,13 @@@ private
  typedef boost::shared_ptr<ClientClassDef> ClientClassDefPtr;
  
  /// @brief Defines a map of ClientClassDef's, keyed by the class name.
- typedef std::map<std::string,ClientClassDefPtr> ClientClassDefMap;
+ 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 Defines a pair for working with ClientClassMap
+ typedef std::pair<std::string, ClientClassDefPtr> ClientClassMapPair;
  
  /// @brief Maintains a list of ClientClassDef's
  class ClientClassDictionary {