add missing stream_count arg

fixes points 3a and 4 of the ticket

Refs #11812
escape xml special characters when printing decoded descriptors

fixes point 3b of the ticket

Fixes #11812