Update the patchsets to apply cleanly

- New rebased stream wrappers patch
- EZC fix has been merged upstream
- Removed the stale patches