Merging with netty4 branch

see https://github.com/twitter/cloudhopper-smpp/pull/47