Merges in rt38686

    Merges in rt38619

    Merges in rt37501

    Merges in rt37780.

    Merges in rt37426.

Updated version info, etc

    Merges in rt36780.

    Merges in rt26376

    Merges in rt37415.

    server/dhcpd.c -
        moved declarations of local variable in main(), used by pid file
        logic, outside of debug conditional compilation.

    [rt37084]

    Change how we print the preferred_live and max_life variables
    into envvironment strings in the client code from being a signed
    int to an unsigned int.

    [rt38078] Move the check for another server to be earlier

    Move the code that checks if there is already a server
    running to be executed earlier in the process.  This
    puts it before the server touches the database which
    should avoid problems with rewriting a database from
    under a running server.

Add a flag to avoid supersede_lease calling pool_timer
recursively when pool_timer can't handle that.
rt38002

Change the stopping point for processing statements in the
host portion of the inform processing from a host option to
a subnet one.

rt35712

    Merges in rt36960.

    Merges in rt37551.

    Merges in rt20558.

    Merges in rt37368.

        Merges in rt21323.

Patch for 36810 & 20352
This coves several related problems
1) When the primary is in conflict done it allows the secondary to
transition around resolution interrupted and potentical conflict previously
the primary would die on an illegal state.

2) It allows the servers to restart a bind update request.  Previously if
one of the servers sent an udpate request and there died (or had the communications
interrupted) in some states the first server wouldn't retransmit a new
update request and the other server wouldn't send any bind updates. This
was noticed in potential conflict.

3) Updated the state transitions to move the leases on the ack queue
back to the update queue in case of conflict-done as we might need to
retransmit them all.

4) Updated a transition from startup to potentical conflict instead
of resolution interrupted when the servers reconnect during the startup
phase in order to avoid a diffferent dead lock.

    Merger in rt37708.

    Merges in rt32222.

    Merges in rt36233.

    Merges in rt35958 which includes fix for rt32545
    Also updated dhcp/.gitignore

    Merges in rt22806

    Merges in rt32453.

As part of 4.2.0 we renamed a number of errors but continued
to include the old ones in case somebody was building something
using our libraries.  This #ifdefs them and by defaults removes them
from the compile.

    Merges in rt36664

    Gave Tobias Stoeckmann credit for his contributions.

    Merges in rt36653

    Merges in rt36021