Merge "Bug 1885: VM ingress rule is not installed for vlan networking"

diff --cc openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/L2ForwardingService.java
index 0cca6cd20b4303bbe40e96e84f9cd8c724cd2366,ad7b843f047aec394397c88a828c99d966327349..5bcc52955770ec1e45ad5176f669100bb70e8923
--- 1/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/L2ForwardingService.java
--- 2/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/L2ForwardingService.java
+++ b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/L2ForwardingService.java
@@@ -942,4 -977,4 +942,4 @@@ public class L2ForwardingService extend
                  logger.debug("createOutputPortInstructions() : applyAction {}", aab.build());
                  return ib;
      }
--}
++}