Migrated netty to 4.x: rebased to 1.8.0-SNAPSHOT and fixed the merge error

Author: ooasis

src/SecureRpcHelper.java

@@ -28,13 +28,6 @@
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-import io.netty.buffer.Unpooled;
->>>>>>> Netty 4.0: optimized ByteBuf allocation for IO
-=======
->>>>>>> Netty 4.0: more optimization on buffer allocation
 import io.netty.channel.Channel;
 import io.netty.util.ReferenceCountUtil;
 import org.hbase.async.auth.ClientAuthProvider;