[VOL-3212] Modification to Trap flows:
- Inserting VLAN and PCP in the treatment of the IGMP trap flow. Uniforming it to VOD flow.
- Removing VLAN match and insertinbg VLAN push for EAPOL.
- Removing VLAN match if not required, pushing it or swapping it and setting the PCP in DHCP.

Change-Id: I0df0e1f58abce20bed7d480536668014cdc55f72
(cherry picked from commit 0e34f56d754f56fd332261ca547e8ce503f1b983)
diff --git a/.gitreview b/.gitreview
index 981cc4c..ea3aff4 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,3 +3,4 @@
 port=29418
 project=olt.git
 defaultremote=origin
+defaultbranch=olt-4.2