Fix the Rich header analysis algorithm#973

Merged

PeterMatula merged 4 commits intoavast:masterfrom HoundThe:rich_header_junk

Jul 9, 2021

+48-9

Commits on Jun 21, 2021

Commits on Jul 7, 2021

Change code style to follow the rest of the file code
HoundThe
committed