merge fixes

Author: NSAmelchev

modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java

@@ -226,7 +226,7 @@ public DiscoveryMessageFactory(@Nullable Marshaller cstDataMarshall, @Nullable C
         factory.register((short)27, DistributedMetaStorageCasAckMessage::new, new DistributedMetaStorageCasAckMessageSerializer());
         factory.register((short)28, TcpDiscoveryClientReconnectMessage::new,
             new TcpDiscoveryClientReconnectMessageMarshallableSerializer(cstDataMarshall, cstDataMarshallClsLdr));
-        factory.register((short)24, FullMessage::new, new FullMessageSerializer());
+        factory.register((short)29, FullMessage::new, new FullMessageSerializer());
 
         factory.register((short)86, GridCacheVersion::new, new GridCacheVersionSerializer());
 

modules/core/src/main/java/org/apache/ignite/internal/util/distributed/FullMessage.java

@@ -113,7 +113,7 @@ public Map<UUID, Throwable> error() {
 
     /** {@inheritDoc} */
     @Override public short directType() {
-        return 24;
+        return 29;
     }
 
     /** {@inheritDoc} */

modules/core/src/test/java/org/apache/ignite/internal/util/distributed/MessagesPluginProvider.java

@@ -54,7 +54,7 @@ public static class MessagesInjectedTcpDiscoverySpi extends TcpDiscoverySpi {
         /** {@inheritDoc} */
         @Override protected void initLocalNode(int srvPort, boolean addExtAddrAttr) {
             GridTestUtils.setFieldValue(this, TcpDiscoverySpi.class, "msgFactory", new IgniteMessageFactoryImpl(
-                new MessageFactoryProvider[] { new DiscoveryMessageFactory(), FACTORY_PROVIDER}));
+                new MessageFactoryProvider[] { new DiscoveryMessageFactory(null, null), FACTORY_PROVIDER}));
 
             super.initLocalNode(srvPort, addExtAddrAttr);
         }