Removed a cyclic dependency in the CLI code.

-package org.onlab.onos.cli.net;
+package org.onlab.onos.cli;
 
 import org.onlab.onos.cluster.ControllerNode;
 import org.onlab.onos.net.Element;

@@ -2,7 +2,6 @@ package org.onlab.onos.cli;
 
 import com.google.common.collect.Lists;
 import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cli.net.Comparators;
 import org.onlab.onos.cluster.ClusterService;
 import org.onlab.onos.cluster.ControllerNode;
 import org.onlab.onos.cluster.MastershipService;

 package org.onlab.onos.cli;
 
 import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cli.net.Comparators;
 import org.onlab.onos.cluster.ClusterService;
 import org.onlab.onos.cluster.ControllerNode;
 

@@ -3,6 +3,7 @@ package org.onlab.onos.cli.net;
 import com.google.common.collect.Lists;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
+import org.onlab.onos.cli.Comparators;
 import org.onlab.onos.net.DeviceId;
 import org.onlab.onos.net.topology.TopologyCluster;
 

@@ -2,6 +2,7 @@ package org.onlab.onos.cli.net;
 
 import com.google.common.collect.Lists;
 import org.apache.karaf.shell.commands.Command;
+import org.onlab.onos.cli.Comparators;
 import org.onlab.onos.net.topology.TopologyCluster;
 
 import java.util.Collections;

@@ -2,6 +2,7 @@ package org.onlab.onos.cli.net;
 
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
+import org.onlab.onos.cli.Comparators;
 import org.onlab.onos.net.Device;
 import org.onlab.onos.net.Port;
 import org.onlab.onos.net.device.DeviceService;

@@ -2,6 +2,7 @@ package org.onlab.onos.cli.net;
 
 import org.apache.karaf.shell.commands.Command;
 import org.onlab.onos.cli.AbstractShellCommand;
+import org.onlab.onos.cli.Comparators;
 import org.onlab.onos.net.Device;
 import org.onlab.onos.net.device.DeviceService;
 

@@ -9,6 +9,7 @@ import java.util.Map;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.onlab.onos.cli.AbstractShellCommand;
+import org.onlab.onos.cli.Comparators;
 import org.onlab.onos.net.Device;
 import org.onlab.onos.net.DeviceId;
 import org.onlab.onos.net.device.DeviceService;

@@ -2,6 +2,7 @@ package org.onlab.onos.cli.net;
 
 import org.apache.karaf.shell.commands.Command;
 import org.onlab.onos.cli.AbstractShellCommand;
+import org.onlab.onos.cli.Comparators;
 import org.onlab.onos.net.Host;
 import org.onlab.onos.net.host.HostService;