Xconnect misc. fixes for production issues

Change-Id: I582db5084f9d525a43cd3855781f047e617cdb3c
diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2GroupHandler.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2GroupHandler.java
index c5204ce..2521daf 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2GroupHandler.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2GroupHandler.java
@@ -692,6 +692,7 @@
         MacAddress dstMac = readEthDstFromSelector(nextObj.meta());
         if (dstMac != null && dstMac.isMulticast()) {
             processL2MulticastNextObjective(nextObj);
+            return;
         }
 
         List<GroupInfo> groupInfos = prepareL2InterfaceGroup(nextObj, assignedVlan);