Refactor stream reset when cancelling in an progress upload
Refactor stream reset when cancelling in an progress upload

Using the pre-existing method means better error handling if the RST
frame fails and better logging.
apache/tomcat,apache/tomcat,apache/tomcat,apache/tomcat,apache/tomcat