[master] Finished merge of trac3839 (removed unused exception variables)

diff --cc src/lib/dhcp/libdhcp++.cc
Simple merge

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

diff --cc src/lib/dhcp/option6_client_fqdn.cc
index 002875e625ed74416de62acc64c55bed08afd995,de2b18b31ebeee009eb10d322180a17a3bcadfbc..597a97f84ca32c4ef8048715569c540194a4e6e9
--- 1/src/lib/dhcp/option6_client_fqdn.cc
--- 2/src/lib/dhcp/option6_client_fqdn.cc
+++ b/src/lib/dhcp/option6_client_fqdn.cc
@@@ -249,8 -249,8 +249,8 @@@ Option6ClientFqdnImpl::parseWireData(Op
              isc::util::InputBuffer name_buf(&buf[0], buf.size());
              try {
                  domain_name_.reset(new isc::dns::Name(name_buf, true));
-             } catch (const Exception& ex) {
+             } catch (const Exception&) {
 -                isc_throw(InvalidOption6FqdnDomainName, "failed to parse"
 +                isc_throw(InvalidOption6FqdnDomainName, "failed to parse "
                            "partial domain-name from wire format");
              }
              // Terminating zero was missing, so set the domain-name type
@@@ -264,8 -264,8 +264,8 @@@
                                              std::distance(first, last));
              try {
                  domain_name_.reset(new isc::dns::Name(name_buf, true));
-             } catch (const Exception& ex) {
+             } catch (const Exception&) {
 -                isc_throw(InvalidOption6FqdnDomainName, "failed to parse"
 +                isc_throw(InvalidOption6FqdnDomainName, "failed to parse "
                            "fully qualified domain-name from wire format");
              }
              // Set the domain-type to fully qualified domain name.

diff --cc src/lib/dhcp_ddns/ncr_msg.cc
Simple merge

diff --cc src/lib/dhcpsrv/memfile_lease_mgr.cc
Simple merge

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

diff --cc src/lib/util/csv_file.cc
Simple merge