MFC: all except 1.63:
MFC: all except 1.63:

1.59-1.62: already merged
1.63: removal of bridge(45) not merged
1.64: already merged
1.65: use uintmax_t
1.66: repair formatting to 79 columns
1.67: increase accuracy of timeouts and thus of per-interval counts
1.68: style fixes

Requested by:	kuriyama (1.66)

1.66 changes the whitespace in output.  Hopefully nothing depends on the
exact misformatting that it fixes.

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase