Merge pull request #2658 in SNORT/snort3 from ~MIALTIZE/snort3:catch_update to master

Merge pull request #2658 in SNORT/snort3 from ~MIALTIZE/snort3:catch_update to master

Squashed commit of the following:

commit 8ade74b146db3de41d78a540a1f083793fd02322
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Dec 8 18:09:05 2020 -0500

    build: Clean up various cppcheck warnings

commit 515fdcc0e0d733396c13a256d46fde3087540b55
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Sep 8 11:07:35 2020 -0400

    catch: Avoid using INTERNAL_CATCH_UNIQUE_NAME in our headers

commit 2084175f47ec1007db9952518670d93d9382e8fe
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Dec 8 17:48:18 2020 -0500

    catch: Update to Catch v2.13.3