=htc #15560 close entity data stream eagerly + more tests + one additional fix

here as well: might as well verify that it ends properly; if nothing else it will terminate some flows, no?