Merge branch 'master' into topic/netvirtsb2

Change-Id: I8555d101f09b2e347a0ecf199dbbb3ce3be81905
Signed-off-by: Sam Hague <shague@redhat.com>

diff --cc integrationtest/pom.xml
Simple merge

diff --cc openstack/net-virt-providers/pom.xml
Simple merge

diff --cc openstack/net-virt/pom.xml
Simple merge

diff --cc southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java
index 7395182d87d246131191f0e640cfe963755c5b32,55dc19fd1ee872d7faeeacd04da3a21f842d117e..215b36b82e2cb092455ec5d2a73aaf90bcd73242
--- 1/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java
--- 2/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java
+++ b/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java
@@@ -14,7 -14,9 +14,8 @@@ import static org.ops4j.pax.exam.karaf.
  import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
  
  import com.google.common.collect.ImmutableBiMap;
+ import com.google.common.collect.Lists;
  import com.google.common.collect.ObjectArrays;
 -
  import java.net.InetAddress;
  import java.net.UnknownHostException;
  import java.util.ArrayList;