Flows are overlapped when we add custom SG along with ANY rule.

ODL Version : Boron_SR2

Openstack : mitaka

Steps to Reproduce :
1. Create SG1 with OtherProtocols->ANY for both ingress and egress
2. Create VM1 and associate SG1
3. Check the flows added for TCP_ALL, UDP_ALL, ICMP_ALL and IP rule in table 40 and table 90.
4. Create SG2 with Other_Protocol->TCP or ALL_TCP for both ingress and egress.
5. Associate SG2 with created VM1
6. Flows for newly added SG2 will not added. Only old flows will be exist in table 40 and 90.
7. Remove SG2 from VM1.
8. Flow for TCP_ALL will be removed from both table 40 and 90 even though SG1 exist in VM1.

Reason :
TCP flow created by Other_Protocol->ANY rule has been equally matched with TCP_ALL or Other_protocol->TCP flow. So, flow has been replaced instead
of adding.

Note : This issue also exits in UDP and ICMP also.