Bumping netty dependency versions to 4.1.5.Final.

Including test fixes.

Few more places referencing atomix version

Change-Id: I48fb8fa255624a86ae12117845603f7d53f1c29e
diff --git a/lib/deps.json b/lib/deps.json
index a6283b6..0f4cc73 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -157,15 +157,16 @@
     "minimal-json": "mvn:com.eclipsesource.minimal-json:minimal-json:0.9.4",
     "minlog": "mvn:com.esotericsoftware:minlog:1.3.0",
     "netty": "mvn:io.netty:netty:3.10.5.Final",
-    "netty-buffer": "mvn:io.netty:netty-buffer:4.0.40.Final",
-    "netty-codec": "mvn:io.netty:netty-codec:4.0.40.Final",
-    "netty-common": "mvn:io.netty:netty-common:4.0.40.Final",
-    "netty-handler": "mvn:io.netty:netty-handler:4.0.40.Final",
-    "netty-transport": "mvn:io.netty:netty-transport:4.0.40.Final",
-    "netty-transport-native-epoll": "mvn:io.netty:netty-transport-native-epoll:4.0.40.Final",
-    "catalyst-concurrent": "mvn:io.atomix.catalyst:catalyst-concurrent:1.1.1",
-    "catalyst-netty": "mvn:io.atomix.catalyst:catalyst-netty:1.1.1",
-    "catalyst-transport": "mvn:io.atomix.catalyst:catalyst-transport:1.1.1",
+    "netty-buffer": "mvn:io.netty:netty-buffer:4.1.5.Final",
+    "netty-codec": "mvn:io.netty:netty-codec:4.1.5.Final",
+    "netty-common": "mvn:io.netty:netty-common:4.1.5.Final",
+    "netty-handler": "mvn:io.netty:netty-handler:4.1.5.Final",
+    "netty-transport": "mvn:io.netty:netty-transport:4.1.5.Final",
+    "netty-transport-native-epoll": "mvn:io.netty:netty-transport-native-epoll:4.1.5.Final",
+    "netty-resolver": "mvn:io.netty:netty-resolver:4.1.5.Final",
+    "catalyst-concurrent": "mvn:io.atomix.catalyst:catalyst-concurrent:1.1.2",
+    "catalyst-netty": "mvn:io.atomix.catalyst:catalyst-netty:1.1.2",
+    "catalyst-transport": "mvn:io.atomix.catalyst:catalyst-transport:1.1.2",
     "objenesis": "mvn:org.objenesis:objenesis:2.2",
     "openflowj": "mvn:org.onosproject:openflowj:0.9.7.onos",
     "org.apache.felix.scr": "mvn:org.apache.felix:org.apache.felix.scr:1.8.2",