Merge "Bug 4579 - Periodic ARP resolver is missing callback for MAC updates" into...

diff --cc openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/ConfigActivator.java
Simple merge

diff --cc openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java
index 865a9ffebed5f3a707e6956308924e2baee5322a,8d261ff6da622ca195bf26f4fdda07da9b925387..537fb8e91cc0b6c341ecbed93085093ac26fd131
--- 1/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java
--- 2/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java
@@@ -19,12 -19,15 +19,16 @@@ import org.opendaylight.neutron.spi.Neu
  import org.opendaylight.neutron.spi.NeutronPort;
  import org.opendaylight.neutron.spi.NeutronRouter;
  import org.opendaylight.neutron.spi.NeutronRouter_Interface;
 +import org.opendaylight.neutron.spi.NeutronSecurityGroup;
  import org.opendaylight.neutron.spi.NeutronSubnet;
  import org.opendaylight.neutron.spi.Neutron_IPs;
+ import org.opendaylight.ovsdb.openstack.netvirt.AbstractEvent;
+ import org.opendaylight.ovsdb.openstack.netvirt.AbstractHandler;
  import org.opendaylight.ovsdb.openstack.netvirt.ConfigInterface;
+ import org.opendaylight.ovsdb.openstack.netvirt.NeutronL3AdapterEvent;
  import org.opendaylight.ovsdb.openstack.netvirt.api.*;
  import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper;
+ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;

diff --cc openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3AdapterTest.java
Simple merge