[master] Merge branch 'trac2307'

Conflicts:
	tests/tools/perfdhcp/Makefile.am

diff --cc tests/tools/perfdhcp/Makefile.am
Simple merge

diff --cc tests/tools/perfdhcp/command_options.cc
index 26255e8e020d11282f4086c96d3b3318f586ec08,61379306e7973519a56a2fd566e206247c5894d2..94eb265b604f40914e16e947f4146a4a5ea42a21
--- 1/tests/tools/perfdhcp/command_options.cc
--- 2/tests/tools/perfdhcp/command_options.cc
+++ b/tests/tools/perfdhcp/command_options.cc
@@@ -821,10 -712,9 +821,10 @@@ CommandOptions::printCommandLine() cons
          if (ipversion_ == 4) {
              std::cout << "DISCOVER-OFFER only" << std::endl;
          } else {
-             std::cout << "SOLICIT-ADVERETISE only" << std::endl;
+             std::cout << "SOLICIT-ADVERTISE only" << std::endl;
          }
      }
 +    std::cout << "lease-type=" << getLeaseType().toText() << std::endl;
      if (rate_ != 0) {
          std::cout << "rate[1/s]=" << rate_ <<  std::endl;
      }
@@@ -953,17 -835,9 +953,17 @@@ CommandOptions::usage() const 
          "    clients.  This can be specified multiple times, each instance is\n"
          "    in the <type>=<value> form, for instance:\n"
          "    (and default) mac=00:0c:01:02:03:04.\n"
-         "-d<drop-time>: Specify the time after which a requeqst is treated as\n"
+         "-d<drop-time>: Specify the time after which a request is treated as\n"
          "    having been lost.  The value is given in seconds and may contain a\n"
          "    fractional component.  The default is 1 second.\n"
 +        "-e<lease-type>: A type of lease being requested from the server. It\n"
 +        "    may be one of the following: address-only, prefix-only or\n"
 +        "    address-and-prefix. The address-only indicates that the regular\n"
 +        "    address (v4 or v6) will be requested. The prefix-only indicates\n"
 +        "    that the IPv6 prefix will be requested. The address-and-prefix\n"
 +        "    indicates that both IPv6 address and prefix will be requested.\n"
 +        "    The '-e prefix-only' and -'e address-and-prefix' must not be\n"
 +        "    used with -4.\n"
          "-E<time-offset>: Offset of the (DHCPv4) secs field / (DHCPv6)\n"
          "    elapsed-time option in the (second/request) template.\n"
          "    The value 0 disables it.\n"