merge fixes2

Author: NSAmelchev

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

@@ -19,13 +19,15 @@
 
 import org.apache.ignite.internal.managers.communication.IgniteMessageFactoryImpl;
 import org.apache.ignite.internal.managers.discovery.DiscoveryMessageFactory;
+import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.plugin.AbstractTestPluginProvider;
 import org.apache.ignite.plugin.ExtensionRegistry;
 import org.apache.ignite.plugin.PluginContext;
 import org.apache.ignite.plugin.extensions.communication.MessageFactoryProvider;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.testframework.GridTestUtils;
 
+import static org.apache.ignite.marshaller.Marshallers.jdk;
 import static org.junit.Assert.assertTrue;
 
 /** */
@@ -54,7 +56,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(null, null), FACTORY_PROVIDER}));
+                new MessageFactoryProvider[] { new DiscoveryMessageFactory(jdk(), U.gridClassLoader()), FACTORY_PROVIDER}));
 
             super.initLocalNode(srvPort, addExtAddrAttr);
         }