Merge branch 'master' into topic/netvirtsbmerge

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

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

diff --cc southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/AbstractConfigTestBase.java
index e471ec70a55587fdce711213925f178231a4c90c,8ae084a4c23ecfafaaf30b600c1049987c95d32e..01043f7da1e20daef3efb93d13d0c79a88e4c646
--- 1/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/AbstractConfigTestBase.java
--- 2/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/AbstractConfigTestBase.java
+++ b/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/AbstractConfigTestBase.java
@@@ -103,11 -92,10 +100,10 @@@ public abstract class AbstractConfigTes
      public Option[] config() {
          LOG.info("Calling config, configTimes: {}", configTimes);
          configTimes++;
-         extras = setExtras();
          Option[] options = new Option[] {
 -                // KarafDistributionOption.debugConfiguration("5005", true),
 +                //KarafDistributionOption.debugConfiguration("5005", true),
                  karafDistributionConfiguration()
 -                        .frameworkUrl(getKarafDistro())
 +                        .frameworkUrl(getKarafDistro(extras))
                          .unpackDirectory(new File("target/exam"))
                          .useDeployFolder(false),
                  keepRuntimeFolder(),

diff --cc southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java
Simple merge