BGP session unit tests failing after Netty version bump

testHandleNotifyMsg(org.opendaylight.protocol.bgp.rib.impl.BGPSessionImplTest) Time elapsed: 0.039 sec <<< ERROR!
java.lang.IllegalArgumentException: promise.channel does not match: [id: 0x102d8e5d, L:/1.1.1.4:12345 - R:/1.1.1.2:12345] (expected: [id: 0x102d8e5d, L:embedded - R:embedded])
at io.netty.channel.AbstractChannelHandlerContext.validatePromise(AbstractChannelHandlerContext.java:778)
at io.netty.channel.AbstractChannelHandlerContext.close(AbstractChannelHandlerContext.java:501)
at io.netty.channel.DefaultChannelPipeline.close(DefaultChannelPipeline.java:1039)
at io.netty.channel.AbstractChannel.close(AbstractChannel.java:218)
at io.netty.channel.embedded.EmbeddedChannel.close(EmbeddedChannel.java:342)
at io.netty.channel.embedded.EmbeddedChannel.close(EmbeddedChannel.java:329)
at org.opendaylight.protocol.bgp.rib.impl.BGPSessionImpl.closeWithoutMessage(BGPSessionImpl.java:295)
at org.opendaylight.protocol.bgp.rib.impl.BGPSessionImpl.handleMessage(BGPSessionImpl.java:223)
at org.opendaylight.protocol.bgp.rib.impl.BGPSessionImplTest.testHandleNotifyMsg(BGPSessionImplTest.java:187)

testBGPSession(org.opendaylight.protocol.bgp.rib.impl.BGPSessionImplTest) Time elapsed: 0.017 sec <<< ERROR!
java.lang.IllegalArgumentException: promise.channel does not match: [id: 0xad0a5eb9, L:/1.1.1.4:12345 - R:/1.1.1.2:12345] (expected: [id: 0xad0a5eb9, L:embedded - R:embedded])
at io.netty.channel.AbstractChannelHandlerContext.validatePromise(AbstractChannelHandlerContext.java:778)
at io.netty.channel.AbstractChannelHandlerContext.close(AbstractChannelHandlerContext.java:501)
at io.netty.channel.DefaultChannelPipeline.close(DefaultChannelPipeline.java:1039)
at io.netty.channel.AbstractChannel.close(AbstractChannel.java:218)
at io.netty.channel.embedded.EmbeddedChannel.close(EmbeddedChannel.java:342)
at io.netty.channel.embedded.EmbeddedChannel.close(EmbeddedChannel.java:329)
at org.opendaylight.protocol.bgp.rib.impl.BGPSessionImpl.closeWithoutMessage(BGPSessionImpl.java:295)
at org.opendaylight.protocol.bgp.rib.impl.BGPSessionImpl.close(BGPSessionImpl.java:203)
at org.opendaylight.protocol.bgp.rib.impl.BGPSessionImplTest.testBGPSession(BGPSessionImplTest.java:153)

testHoldTimerExpire(org.opendaylight.protocol.bgp.rib.impl.BGPSessionImplTest) Time elapsed: 111.767 sec <<< FAILURE!
java.lang.AssertionError: expected:<IDLE> but was:<UP>
at org.junit.Assert.fail(Assert.java:88)
at org.junit.Assert.failNotEquals(Assert.java:743)
at org.junit.Assert.assertEquals(Assert.java:118)
at org.junit.Assert.assertEquals(Assert.java:144)
at org.opendaylight.protocol.bgp.rib.impl.BGPSessionImplTest.testHoldTimerExpire(BGPSessionImplTest.java:206)

testHandleOpenMsg(org.opendaylight.protocol.bgp.rib.impl.BGPSessionImplTest) Time elapsed: 0.003 sec <<< ERROR!
java.lang.IllegalArgumentException: promise.channel does not match: [id: 0x7be614f3, L:/1.1.1.4:12345 - R:/1.1.1.2:12345] (expected: [id: 0x7be614f3, L:embedded - R:embedded])
at io.netty.channel.AbstractChannelHandlerContext.validatePromise(AbstractChannelHandlerContext.java:778)
at io.netty.channel.AbstractChannelHandlerContext.close(AbstractChannelHandlerContext.java:501)
at io.netty.channel.DefaultChannelPipeline.close(DefaultChannelPipeline.java:1039)
at io.netty.channel.AbstractChannel.close(AbstractChannel.java:218)
at io.netty.channel.embedded.EmbeddedChannel.close(EmbeddedChannel.java:342)
at io.netty.channel.embedded.EmbeddedChannel.close(EmbeddedChannel.java:329)
at org.opendaylight.protocol.bgp.rib.impl.BGPSessionImpl.closeWithoutMessage(BGPSessionImpl.java:295)
at org.opendaylight.protocol.bgp.rib.impl.BGPSessionImpl.terminate(BGPSessionImpl.java:307)
at org.opendaylight.protocol.bgp.rib.impl.BGPSessionImpl.handleMessage(BGPSessionImpl.java:218)
at org.opendaylight.protocol.bgp.rib.impl.BGPSessionImplTest.testHandleOpenMsg(BGPSessionImplTest.java:175)

Running org.opendaylight.protocol.bgp.rib.impl.ExportPolicyTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.524 sec - in org.opendaylight.protocol.bgp.rib.impl.ExportPolicyTest
Running org.opendaylight.protocol.bgp.rib.impl.FSMTest
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.509 sec - in org.opendaylight.protocol.bgp.rib.impl.FSMTest
Running org.opendaylight.protocol.bgp.rib.impl.FromExternalImportPolicyTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.424 sec - in org.opendaylight.protocol.bgp.rib.impl.FromExternalImportPolicyTest
Running org.opendaylight.protocol.bgp.rib.impl.LocRibWriterTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.835 sec - in org.opendaylight.protocol.bgp.rib.impl.LocRibWriterTest
Running org.opendaylight.protocol.bgp.rib.impl.ParserToSalTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.187 sec - in org.opendaylight.protocol.bgp.rib.impl.ParserToSalTest
Running org.opendaylight.protocol.bgp.rib.impl.PeerTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.74 sec - in org.opendaylight.protocol.bgp.rib.impl.PeerTest
Running org.opendaylight.protocol.bgp.rib.impl.StrictBGPPeerRegistryTest
Tests run: 10, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.542 sec - in org.opendaylight.protocol.bgp.rib.impl.StrictBGPPeerRegistryTest
Running org.opendaylight.protocol.bgp.rib.impl.SynchronizationTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.136 sec - in org.opendaylight.protocol.bgp.rib.impl.SynchronizationTest

Results :

Failed tests:
BGPSessionImplTest.testHoldTimerExpire:206 expected:<IDLE> but was:<UP>
Tests in error:
BGPSessionImplTest.testBGPSession:153 » IllegalArgument promise.channel does n...
BGPSessionImplTest.testHandleNotifyMsg:187 » IllegalArgument promise.channel d...
BGPSessionImplTest.testHandleOpenMsg:175 » IllegalArgument promise.channel doe...

Tests run: 79, Failures: 1, Errors: 3, Skipped: 0