Fixing patch so that it actually makes the correct diff.

- also includes updates required for Netty API changes.