fix up iohandlers to write separate streams for header and footer again
This commit will be reordered and squashed into a prev commit
after more testing, but let's not let it get clobbered on local box.
Change-Id: I99e1f6aa07e61cfa119c7baee9d7ae71b2b72a1a