Adds retry for tcp-connection abort
Merge branch 'froth' into trunk