8183028: Improve CMS header processing

Reviewed-by: serb, rhalade, mschoene
1 file changed