Merged in default (pull request #629)

Remove the queued_output_stream_clear_on_error test as it was more of a heuristic test than anything else

Approved-by: Elliott Sales de Andrade
Approved-by: John Bailey