[master] Finished merge of trac5126 (flat style)

diff --cc src/lib/cc/simple_parser.h
Simple merge

diff --cc src/lib/cc/tests/simple_parser_unittest.cc
Simple merge

diff --cc src/lib/dhcpsrv/parsers/client_class_def_parser.cc
index 97a434ac3d9a458f0c2e65443099e00d079ce59d,0180371958344c08af1d907b3bb823bc9f0607b4..b07b1bf2a307f5d9bb93cfb6b05ef0c9cd9e6e7a
--- 1/src/lib/dhcpsrv/parsers/client_class_def_parser.cc
--- 2/src/lib/dhcpsrv/parsers/client_class_def_parser.cc
+++ b/src/lib/dhcpsrv/parsers/client_class_def_parser.cc
@@@ -145,10 -141,10 +143,10 @@@ ClientClassDefParser::parse(ClientClass
  
      // Add the client class definition
      try {
 -        class_dictionary->addClass(name, match_expr, options, next_server,
 -                                   sname, filename);
 +        class_dictionary->addClass(name, match_expr, test, options,
 +                                   next_server, sname, filename);
      } catch (const std::exception& ex) {
-         isc_throw(DhcpConfigError, ex.what()
+         isc_throw(DhcpConfigError, "Can't add class: " << ex.what()
                    << " (" << class_def_cfg->getPosition() << ")");
      }
  }