Merge pull request #2907 in SNORT/snort3 from ~MDAGON/snort3:nhi_memory to master

Merge pull request #2907 in SNORT/snort3 from ~MDAGON/snort3:nhi_memory to master

Squashed commit of the following:

commit 5dc2f46fb2ec58c29d8760bc74274cdb51571da7
Author: Maya Dagon <mdagon@cisco.com>
Date:   Thu May 27 14:06:39 2021 -0400

    Code Review

commit ef675a1befeccbd27e3f0fd208a0726da17483ef
Author: Maya Dagon <mdagon@cisco.com>
Date:   Thu May 27 12:22:06 2021 -0400

    code review

commit b0cd942dddef767021e96dfbed2d47b0cc9c20c2
Author: Maya Dagon <mdagon@cisco.com>
Date:   Wed May 26 11:56:50 2021 -0400

    Remove sizeof(uint8_t) for consistency

commit 97cd8ecca1a45aa80c65ad31a2b54e91fff0209b
Author: Maya Dagon <mdagon@cisco.com>
Date:   Mon May 24 13:27:48 2021 -0400

    http_inspect: additional memory tracking