Merge pull request #2427 in SNORT/snort3 from ~MIALTIZE/snort3:cpputest_leaks to...

Merge pull request #2427 in SNORT/snort3 from ~MIALTIZE/snort3:cpputest_leaks to master

Squashed commit of the following:

commit f1f70793fa2f9bfa46a9f48245372df2899bcc5a
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Aug 31 15:35:04 2020 -0400

    host_tracker: Fix allocator unit test to work on 32-bit systems again

commit 85a78101fe8bfb9d3055488bcba029ec4e430f02
Author: Michael Altizer <mialtize@cisco.com>
Date:   Thu Aug 27 13:43:28 2020 -0400

    cmake: Restore accidentally removed caching of static DAQ modules

commit a89ffd26d712ca56ee8fafe24e1d64f616fc9c8b
Author: Michael Altizer <mialtize@cisco.com>
Date:   Thu Aug 27 11:15:02 2020 -0400

    utils: Add sys/time.h to util.h for struct timeval definition

    This fixes the Alpine Linux build issue where the forward declaration
    of struct timval from ts_print() ended up in the snort namespace.

commit d3c78c5f6ec5fbc21231043512a3d90e30488e64
Author: Michael Altizer <mialtize@cisco.com>
Date:   Thu Aug 27 11:12:32 2020 -0400

    rna: Remove redefinition of USHRT_MAX

commit 9393c5e3621b1900acf15d07e08020c98be763cd
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Aug 25 12:41:00 2020 -0400

    tests: Fix the majority of memory leaks in CppUTest unit tests

    Additionally, this allows us to use the finally released CppUTest 4.0.

commit 7d363fe48a6a11836bd9e44f2fd8d54f936acafc
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Aug 25 17:18:19 2020 -0400

    style: Replace some tabs that snuck in with proper spaces