CSIT southbound-all tests failing because hwvtep and southbound are both enabled

The below exception comes out during the southbound-all tests. Code was added to allow both the southbound and hwvtepsouthbound to be running at the same time. Each southbound would ignore schemas it did not care about, but the hwvtep is complaining about the open_vswtich schema - which is shouldn't.

2016-02-16 17:44:47,126 | WARN | pool-30-thread-1 | HwvtepConnectionInstance | 406 - org.opendaylight.ovsdb.hwvtepsouthbound-impl - 1.2.1.Beryllium | Exception attempting to createTransactionInvokers ConnectionInfo [_localIp=IpAddress [_ipv4Address=Ipv4Address [_value=10.30.11.166], _value=[1, 0, ., 3, 0, ., 1, 1, ., 1, 6, 6]], _localPort=PortNumber [_value=6640], _remoteIp=IpAddress [_ipv4Address=Ipv4Address [_value=10.30.11.8], _value=[1, 0, ., 3, 0, ., 1, 1, ., 8]], _remotePort=PortNumber [_value=55870], augmentation=[]]: java.util.concurrent.ExecutionException: org.opendaylight.ovsdb.lib.error.ParsingException: bad DatabaseSchema root, expected "tables" as child but was not found
2016-02-16 17:44:47,128 | WARN | pool-30-thread-1 | HwvtepConnectionManager | 406 - org.opendaylight.ovsdb.hwvtepsouthbound-impl - 1.2.1.Beryllium | Not able to fetch schema for database hardware_vtep from device ConnectionInfo [Remote-address=10.30.11.8, Remote-port=55870, Local-address10.30.11.166, Local-port=6640, type=PASSIVE]
java.util.concurrent.ExecutionException: org.opendaylight.ovsdb.lib.error.ParsingException: bad DatabaseSchema root, expected "tables" as child but was not found
at com.google.common.util.concurrent.AbstractFuture$Sync.getValue(AbstractFuture.java:299)[39:com.google.guava:18.0.0]
at com.google.common.util.concurrent.AbstractFuture$Sync.get(AbstractFuture.java:286)[39:com.google.guava:18.0.0]
at com.google.common.util.concurrent.AbstractFuture.get(AbstractFuture.java:116)[39:com.google.guava:18.0.0]
at org.opendaylight.ovsdb.hwvtepsouthbound.HwvtepConnectionManager.getHwvtepGlobalTableEntry(HwvtepConnectionManager.java:287)[406:org.opendaylight.ovsdb.hwvtepsouthbound-impl:1.2.1.Beryllium]
at org.opendaylight.ovsdb.hwvtepsouthbound.HwvtepConnectionManager.getEntityFromConnectionInstance(HwvtepConnectionManager.java:325)[406:org.opendaylight.ovsdb.hwvtepsouthbound-impl:1.2.1.Beryllium]
at org.opendaylight.ovsdb.hwvtepsouthbound.HwvtepConnectionManager.registerEntityForOwnership(HwvtepConnectionManager.java:251)[406:org.opendaylight.ovsdb.hwvtepsouthbound-impl:1.2.1.Beryllium]
at org.opendaylight.ovsdb.hwvtepsouthbound.HwvtepConnectionManager.connected(HwvtepConnectionManager.java:100)[406:org.opendaylight.ovsdb.hwvtepsouthbound-impl:1.2.1.Beryllium]
at org.opendaylight.ovsdb.lib.impl.OvsdbConnectionService$5.run(OvsdbConnectionService.java:375)[141:org.opendaylight.ovsdb.library:1.2.1.Beryllium]
at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471)[:1.7.0_85]
at java.util.concurrent.FutureTask.run(FutureTask.java:262)[:1.7.0_85]
at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.access$201(ScheduledThreadPoolExecutor.java:178)[:1.7.0_85]
at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:292)[:1.7.0_85]
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)[:1.7.0_85]
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)[:1.7.0_85]
at java.lang.Thread.run(Thread.java:745)[:1.7.0_85]
Caused by: org.opendaylight.ovsdb.lib.error.ParsingException: bad DatabaseSchema root, expected "tables" as child but was not found
at org.opendaylight.ovsdb.lib.schema.DatabaseSchema.fromJson(DatabaseSchema.java:87)[141:org.opendaylight.ovsdb.library:1.2.1.Beryllium]
at org.opendaylight.ovsdb.lib.impl.OvsdbClientImpl$8.apply(OvsdbClientImpl.java:328)[141:org.opendaylight.ovsdb.library:1.2.1.Beryllium]
at org.opendaylight.ovsdb.lib.impl.OvsdbClientImpl$8.apply(OvsdbClientImpl.java:324)[141:org.opendaylight.ovsdb.library:1.2.1.Beryllium]
at com.google.common.util.concurrent.Futures$2.apply(Futures.java:760)[39:com.google.guava:18.0.0]
at com.google.common.util.concurrent.Futures$ChainingListenableFuture.run(Futures.java:906)[39:com.google.guava:18.0.0]
at com.google.common.util.concurrent.MoreExecutors$DirectExecutor.execute(MoreExecutors.java:457)[39:com.google.guava:18.0.0]
at com.google.common.util.concurrent.ExecutionList.executeListener(ExecutionList.java:156)[39:com.google.guava:18.0.0]
at com.google.common.util.concurrent.ExecutionList.execute(ExecutionList.java:145)[39:com.google.guava:18.0.0]
at com.google.common.util.concurrent.AbstractFuture.set(AbstractFuture.java:185)[39:com.google.guava:18.0.0]
at com.google.common.util.concurrent.SettableFuture.set(SettableFuture.java:53)[39:com.google.guava:18.0.0]
at org.opendaylight.ovsdb.lib.jsonrpc.JsonRpcEndpoint.processResult(JsonRpcEndpoint.java:144)[141:org.opendaylight.ovsdb.library:1.2.1.Beryllium]
at org.opendaylight.ovsdb.lib.jsonrpc.JsonRpcServiceBinderHandler.channelRead(JsonRpcServiceBinderHandler.java:43)[141:org.opendaylight.ovsdb.library:1.2.1.Beryllium]
at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:318)[99:io.netty.transport:4.0.33.Final]
at io.netty.channel.AbstractChannelHandlerContext.fireChannelRead(AbstractChannelHandlerContext.java:304)[99:io.netty.transport:4.0.33.Final]
at io.netty.handler.codec.ByteToMessageDecoder.fireChannelRead(ByteToMessageDecoder.java:276)[100:io.netty.codec:4.0.33.Final]
at io.netty.handler.codec.ByteToMessageDecoder.channelRead(ByteToMessageDecoder.java:263)[100:io.netty.codec:4.0.33.Final]
at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:318)[99:io.netty.transport:4.0.33.Final]
at

io.netty.channel.AbstractChannelHandlerContext.fireChannelRead(AbstractChannelHandlerContext.java:304)[99:io.netty.transport:4.0.33.Final]
at io.netty.channel.DefaultChannelPipeline.fireChannelRead(DefaultChannelPipeline.java:846)[99:io.netty.transport:4.0.33.Final]
at io.netty.channel.nio.AbstractNioByteChannel$NioByteUnsafe.read(AbstractNioByteChannel.java:131)[99:io.netty.transport:4.0.33.Final]
at io.netty.channel.nio.NioEventLoop.processSelectedKey(NioEventLoop.java:511)[99:io.netty.transport:4.0.33.Final]
at io.netty.channel.nio.NioEventLoop.processSelectedKeysOptimized(NioEventLoop.java:468)[99:io.netty.transport:4.0.33.Final]
at io.netty.channel.nio.NioEventLoop.processSelectedKeys(NioEventLoop.java:382)[99:io.netty.transport:4.0.33.Final]
at io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:354)[99:io.netty.transport:4.0.33.Final]
at io.netty.util.concurrent.SingleThreadEventExecutor$2.run(SingleThreadEventExecutor.java:112)[98:io.netty.common:4.0.33.Final]
at io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:137)[98:io.netty.common:4.0.33.Final]
... 1 more