Fix COMRAT handling for NITF 2.0 files, and simplify test for this in the NitfImageSegmentParser.