Merge "BUG-634: introduce netty ChannelFactory wrapper"