Michaelrfairhurst/address rule amendments from amd3 #3406

Job	Run time
Prepare CodeQL unit test matrix	4s
Run unit tests (cpp, 2.19.4, codeql-cli/v2.19.4, codeql-bundle-v2.19.4, ubuntu-latest-xl, codeql-...	1h 23m 48s
Run unit tests (c, 2.19.4, codeql-cli/v2.19.4, codeql-bundle-v2.19.4, ubuntu-latest-xl, codeql-cl...	31m 57s
Validate test results	4s
	1h 55m 53s

Provide feedback