ISIS protocol manual merge from 1.6 due to cherry pick merge conflict

Change-Id: I6c3abf6a83ddaeba76293dc7864fcec88e9b4e7e
diff --git a/providers/isis/pom.xml b/providers/isis/pom.xml
index e2ecb7c..400242f 100644
--- a/providers/isis/pom.xml
+++ b/providers/isis/pom.xml
@@ -31,10 +31,10 @@
     <description>ONOS ISIS protocol adapters</description>
 
     <modules>
-        <module>device</module>
         <module>app</module>
         <module>cfg</module>
         <module>cli</module>
+        <module>topology</module>
     </modules>
 
     <dependencies>