NPE EntryMergePolicyFactoryRegistry causes tests deadlocks

12:33:01,458 INFO  [org.infinispan.server.endpoint] (MSC service thread 1-2) DGENDPT10002: REST listening on 127.0.0.1:8280 (mapped to rest)
12:33:01,458 ERROR [org.jboss.msc.service.fail] (MSC service thread 1-6) MSC000001: Failed to start service jboss.datagrid-infinispan-endpoint.hotrod.hotrod-connector: org.jboss.msc.service.StartException in service jboss.datagrid-infinispan-endpoint.hotrod.hotrod-connector: DGENDPT10004: Failed to start HotRodServer
	at org.infinispan.server.endpoint.subsystem.ProtocolServerService.start(ProtocolServerService.java:160)
	at org.jboss.msc.service.ServiceControllerImpl$StartTask.startService(ServiceControllerImpl.java:1948)
	at org.jboss.msc.service.ServiceControllerImpl$StartTask.run(ServiceControllerImpl.java:1881)
	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
	at java.lang.Thread.run(Thread.java:748)
Caused by: org.infinispan.commons.CacheException: Unable to invoke method public void org.infinispan.conflict.impl.DefaultConflictManager.start() on object of type DefaultConflictManager
	at org.infinispan.commons.util.SecurityActions.lambda$invokeAccessibly$0(SecurityActions.java:83)
	at org.infinispan.commons.util.SecurityActions.doPrivileged(SecurityActions.java:71)
	at org.infinispan.commons.util.SecurityActions.invokeAccessibly(SecurityActions.java:76)
	at org.infinispan.commons.util.ReflectionUtil.invokeAccessibly(ReflectionUtil.java:165)
	at org.infinispan.factories.AbstractComponentRegistry$PrioritizedMethod.invoke(AbstractComponentRegistry.java:885)
	at org.infinispan.factories.AbstractComponentRegistry.lambda$invokePrioritizedMethods$3(AbstractComponentRegistry.java:647)
	at org.infinispan.factories.SecurityActions.lambda$run$1(SecurityActions.java:72)
	at org.infinispan.security.Security.doPrivileged(Security.java:81)
	at org.infinispan.factories.SecurityActions.run(SecurityActions.java:71)
	at org.infinispan.factories.AbstractComponentRegistry.invokePrioritizedMethods(AbstractComponentRegistry.java:640)
	at org.infinispan.factories.AbstractComponentRegistry.internalStart(AbstractComponentRegistry.java:633)
	at org.infinispan.factories.AbstractComponentRegistry.start(AbstractComponentRegistry.java:551)
	at org.infinispan.factories.ComponentRegistry.start(ComponentRegistry.java:232)
	at org.infinispan.cache.impl.CacheImpl.start(CacheImpl.java:1000)
	at org.infinispan.cache.impl.AbstractDelegatingCache.start(AbstractDelegatingCache.java:411)
	at org.infinispan.manager.DefaultCacheManager.wireAndStartCache(DefaultCacheManager.java:637)
	at org.infinispan.manager.DefaultCacheManager.createCache(DefaultCacheManager.java:582)
	at org.infinispan.manager.DefaultCacheManager.internalGetCache(DefaultCacheManager.java:468)
	at org.infinispan.manager.DefaultCacheManager.getCache(DefaultCacheManager.java:454)
	at org.infinispan.manager.DefaultCacheManager.getCache(DefaultCacheManager.java:487)
	at org.infinispan.manager.DefaultCacheManager.getCache(DefaultCacheManager.java:478)
	at org.jboss.as.clustering.infinispan.DefaultCacheContainer.getCache(DefaultCacheContainer.java:94)
	at org.jboss.as.clustering.infinispan.DefaultCacheContainer.getCache(DefaultCacheContainer.java:85)
	at org.infinispan.server.hotrod.HotRodServer.addSelfToTopologyView(HotRodServer.java:316)
	at org.infinispan.server.hotrod.HotRodServer.startInternal(HotRodServer.java:237)
	at org.infinispan.server.hotrod.HotRodServer.startInternal(HotRodServer.java:94)
	at org.infinispan.server.core.AbstractProtocolServer.start(AbstractProtocolServer.java:78)
	at org.infinispan.server.endpoint.subsystem.SecurityActions$6.run(SecurityActions.java:136)
	at org.infinispan.server.endpoint.subsystem.SecurityActions$6.run(SecurityActions.java:133)
	at org.infinispan.security.Security.doPrivileged(Security.java:76)
	at org.infinispan.server.endpoint.subsystem.SecurityActions.doPrivileged(SecurityActions.java:42)
	at org.infinispan.server.endpoint.subsystem.SecurityActions.startProtocolServer(SecurityActions.java:140)
	at org.infinispan.server.endpoint.subsystem.ProtocolServerService.startProtocolServer(ProtocolServerService.java:194)
	at org.infinispan.server.endpoint.subsystem.ProtocolServerService.start(ProtocolServerService.java:152)
	... 5 more
Caused by: java.lang.NullPointerException
	at org.infinispan.conflict.EntryMergePolicyFactoryRegistry.createInstance(EntryMergePolicyFactoryRegistry.java:40)
	at org.infinispan.conflict.impl.DefaultConflictManager.start(DefaultConflictManager.java:135)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:498)
	at org.infinispan.commons.util.SecurityActions.lambda$invokeAccessibly$0(SecurityActions.java:79)
	... 38 more