Merge branch 'master' into topic/master/neutron-yang-migration

Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>

diff --cc openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/BridgeConfigurationManagerImpl.java
index e42cac8e12cfb922c77004b157fcc2bc13f2373c,a9e84bad2dc9f657b07c9c55433393d50818aa49..589d042d5f4d06fab088c2fba8b3c27a58eea703
--- 1/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/BridgeConfigurationManagerImpl.java
--- 2/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/BridgeConfigurationManagerImpl.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/BridgeConfigurationManagerImpl.java
@@@ -8,8 -8,9 +8,9 @@@
  
  package org.opendaylight.ovsdb.openstack.netvirt.impl;
  
 -import org.opendaylight.neutron.spi.NeutronNetwork;
 +import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronNetwork;
  import org.opendaylight.ovsdb.openstack.netvirt.ConfigInterface;
+ import org.opendaylight.ovsdb.openstack.netvirt.MdsalHelper;
  import org.opendaylight.ovsdb.openstack.netvirt.NetworkHandler;
  import org.opendaylight.ovsdb.openstack.netvirt.api.BridgeConfigurationManager;
  import org.opendaylight.ovsdb.openstack.netvirt.api.ConfigurationService;