[HZ-1208] Fix persistence config merge from default map

When map configuration is created based on "default" map config,
the HotRestart/DataPersistence configurations need to be merged.
Also, the returned MapConfig should bear the name of the requested
map configuration, not "default" or the wildcard based on which it was
created.

hazelcast/src/main/java/com/hazelcast/internal/dynamicconfig/DynamicConfigurationAwareConfig.java

@@ -62,6 +62,7 @@
 import com.hazelcast.config.cp.CPSubsystemConfig;
 import com.hazelcast.core.ManagedContext;
 import com.hazelcast.internal.config.CacheSimpleConfigReadOnly;
+import com.hazelcast.internal.config.DataPersistenceAndHotRestartMerger;
 import com.hazelcast.internal.config.ExecutorConfigReadOnly;
 import com.hazelcast.internal.config.ExternalDataStoreConfigReadOnly;
 import com.hazelcast.internal.config.FlakeIdGeneratorConfigReadOnly;
@@ -254,7 +255,10 @@ private MapConfig getMapConfigOrNullInternal(String name, String fallbackName) {
     }
 
     private MapConfig getMapConfigInternal(String name, String fallbackName) {
-        return (MapConfig) configSearcher.getConfig(name, fallbackName, supplierFor(MapConfig.class));
+        MapConfig mapConfig = (MapConfig) configSearcher.getConfig(name, fallbackName, supplierFor(MapConfig.class));
+        mapConfig = new MapConfig(mapConfig.setName(name));
+        DataPersistenceAndHotRestartMerger.merge(mapConfig.getHotRestartConfig(), mapConfig.getDataPersistenceConfig());
+        return mapConfig;
     }
 
     @Override

hazelcast/src/test/java/com/hazelcast/config/ConfigTest.java

@@ -85,11 +85,13 @@ public void testInheritanceFromDefaultConfig() {
         assertEqualsStringFormat("Expected %d sync backups, but found %d", 3, binaryMapConfig.getBackupCount());
         assertEqualsStringFormat("Expected %s in-memory format, but found %s",
           MapConfig.DEFAULT_IN_MEMORY_FORMAT, binaryMapConfig.getInMemoryFormat());
+        assertEquals("myBinaryMap", binaryMapConfig.getName());
 
         MapConfig objectMapConfig = hz.getConfig().findMapConfig("myObjectMap");
         assertEqualsStringFormat("Expected %d sync backups, but found %d", 5, objectMapConfig.getBackupCount());
         assertEqualsStringFormat("Expected %s in-memory format, but found %s",
           InMemoryFormat.OBJECT, objectMapConfig.getInMemoryFormat());
+        assertEquals("myObjectMap", objectMapConfig.getName());
     }
 
     @Test