Merge branch 'master' into topic/netvirtsb_merge

Conflicts:
	southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java

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

diff --cc southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java
index 2a206fc338cedfdb4f0145e7284f776ca4686162,41c1a5df86850b583fb87fa182ab3d981f2f4e17..ead70f0af18afb162760c986cbacb2a7b2e8a249
--- 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
@@@ -15,7 -15,9 +15,8 @@@ import static org.ops4j.pax.exam.karaf.
  
  import com.google.common.collect.ImmutableBiMap;
  import com.google.common.collect.Lists;
+ import com.google.common.collect.Maps;
  import com.google.common.collect.ObjectArrays;
 -
  import java.net.InetAddress;
  import java.net.UnknownHostException;
  import java.util.ArrayList;