diff --git a/config/alfresco/deployment/filesystem-target.xml b/config/alfresco/deployment/filesystem-target-sample.xml
similarity index 87%
rename from config/alfresco/deployment/filesystem-target.xml
rename to config/alfresco/deployment/filesystem-target-sample.xml
index ff59e766cd..265cee4a19 100644
--- a/config/alfresco/deployment/filesystem-target.xml
+++ b/config/alfresco/deployment/filesystem-target-sample.xml
@@ -3,18 +3,10 @@
 
 <!--  Built in deployment server target -->
 
-<beans>
+<!--  Sample file -->
+<!-- Copy to <TOMCAT HOME>/shared/alfresco/extension/deployment and rename to filesystem-target.xml (remove the -sample) -->
 
-     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-        <property name="ignoreUnresolvablePlaceholders">
-            <value>true</value>
-        </property>
-        <property name="locations">
-            <list>
-                <value>classpath:alfresco/deployment/filesystem.properties</value>
-            </list>
-        </property>
-    </bean>
+<beans>
  
     <!--  This is the common configuration for all file system receivers -->
     <bean id="fileSystemReceiverService" class="org.alfresco.deployment.impl.fsr.FileSystemReceiverServiceImpl"
diff --git a/config/alfresco/deployment/filesystem.properties b/config/alfresco/deployment/filesystem.properties
deleted file mode 100644
index f2f99edc8a..0000000000
--- a/config/alfresco/deployment/filesystem.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-; Built in deployment receiver properties for the default 
-; filesystem receiver
-
-; filesystem receiver configuration
-deployment.filesystem.rootdir=./wcm
-deployment.filesystem.datadir=${deployment.filesystem.rootdir}/depdata
-deployment.filesystem.logdir=${deployment.filesystem.rootdir}/deplog
-deployment.filesystem.metadatadir=${deployment.filesystem.rootdir}/depmetadata
-
-deployment.filesystem.autofix=true
-deployment.filesystem.errorOnOverwrite=false
-
-; default filesystem target configuration
-deployment.filesystem.default.rootdir=./www
-deployment.filesystem.default.name=filesystem
-deployment.filesystem.default.metadatadir=${deployment.filesystem.metadatadir}/default
-
-
-
-
diff --git a/config/alfresco/extension/restore-context.xml.sample b/config/alfresco/extension/restore-context.xml.sample
deleted file mode 100644
index 5e29f4e84a..0000000000
--- a/config/alfresco/extension/restore-context.xml.sample
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
-
-<beans>
-
-    <bean id="systemInfoBootstrap" parent="systemInfoImporter">
-        <property name="bootstrapView">
-        	<value>alfresco/extension/restore/export_systeminfo.xml</value>
-        </property>
-    </bean>
-
-    <bean id="userBootstrap" parent="userStoreImporter">
-        <property name="bootstrapViews">
-            <list>
-                <props>
-                    <prop key="path">/</prop>
-                    <prop key="location">alfresco/extension/restore/export_users.acp</prop>
-                </props>
-            </list>
-        </property>
-        <property name="log"><value>true</value></property>
-    </bean>
-
-    <bean id="systemBootstrap" parent="systemStoreImporter">
-        <property name="bootstrapViews">
-            <list>
-                <props>
-                    <prop key="path">/</prop>
-                    <prop key="location">alfresco/extension/restore/export_system.acp</prop>
-                </props>
-            </list>
-        </property>
-        <property name="log"><value>true</value></property>
-    </bean>
-
-    <bean id="versionBootstrap" parent="versionStoreImporter">
-        <property name="bootstrapViews">
-            <list>
-                <props>
-                    <prop key="path">/</prop>
-                    <prop key="location">alfresco/extension/restore/export_versions.acp</prop>
-                </props>
-            </list>
-        </property>
-        <property name="log"><value>true</value></property>
-    </bean>
-
-    <bean id="spacesArchiveBootstrap" parent="spacesArchiveStoreImporter">
-        <property name="bootstrapViews">
-            <list>
-                <props>
-                    <prop key="path">/</prop>
-                    <prop key="location">alfresco/extension/restore/export_spaces_archive.acp</prop>
-                </props>
-            </list>
-        </property>
-    </bean>
-
-    <bean id="spacesModelsBootstrap" parent="spacesStoreImporter">
-        <property name="bootstrapViews">
-            <list>
-                <props>
-                    <prop key="path"></prop>
-                    <prop key="location">alfresco/extension/restore/export_models.acp</prop>
-                </props>
-            </list>
-        </property>
-        <property name="log"><value>true</value></property>
-    </bean>
-    
-    <bean id="spacesBootstrap" parent="spacesStoreImporter">
-        <property name="useExistingStore"><value>true</value></property>
-        <property name="bootstrapViews">
-            <list>
-                <props>
-                    <prop key="path">/</prop>
-                    <prop key="location">alfresco/extension/restore/export_spaces.acp</prop>
-                    <prop key="uuidBinding">UPDATE_EXISTING</prop>
-                </props>
-            </list>
-        </property>
-        <property name="log"><value>true</value></property>
-    </bean>
-
-</beans>
diff --git a/config/alfresco/repository.properties b/config/alfresco/repository.properties
index 8c8803686a..a9df261bd6 100644
--- a/config/alfresco/repository.properties
+++ b/config/alfresco/repository.properties
@@ -532,3 +532,36 @@ transferservice.receiver.lockRetryWait=100
 # time" for both source and destination.    Default 5 minutes.
 transferservice.receiver.lockTimeOut=300000
 
+; DM Receiever Properties
+;
+; The name of the DM Receiver target - you deploy to this target name
+deployment.dmr.name=alfresco
+
+; consolidate staging, author and workflow sandboxes to one
+deployment.dmr.consolidate=true
+
+; The name of the Alfresco receiver targer 
+deployment.avm.name=avm
+
+;Where should the root of the web project be stored, by default /www/avm_webapps
+deployment.avm.rootPath=/www/avm_webapps
+
+; Pattern for live stores deployment by the alfresco receiver
+deployment.avm.storeNamePattern=%storeName%-live
+
+; Built in deployment receiver properties for the default 
+; filesystem receiver
+
+; filesystem receiver configuration
+deployment.filesystem.rootdir=./wcm
+deployment.filesystem.datadir=${deployment.filesystem.rootdir}/depdata
+deployment.filesystem.logdir=${deployment.filesystem.rootdir}/deplog
+deployment.filesystem.metadatadir=${deployment.filesystem.rootdir}/depmetadata
+
+deployment.filesystem.autofix=true
+deployment.filesystem.errorOnOverwrite=false
+
+; default filesystem target configuration
+deployment.filesystem.default.rootdir=./www
+deployment.filesystem.default.name=filesystem
+deployment.filesystem.default.metadatadir=${deployment.filesystem.metadatadir}/default
diff --git a/source/java/org/alfresco/repo/avm/MultiTAVMService.java b/source/java/org/alfresco/repo/avm/MultiTAVMService.java
index 4afba84f7e..6137677782 100644
--- a/source/java/org/alfresco/repo/avm/MultiTAVMService.java
+++ b/source/java/org/alfresco/repo/avm/MultiTAVMService.java
@@ -865,11 +865,11 @@ public class MultiTAVMService implements AVMService
     
     private String getTenantPath(String avmPath)
     {
-        if ((avmPath == null) || (! isTenantServiceEnabled()))
+        if ((avmPath == null) || (! isTenantServiceEnabled()) || avmPath.equals("UNKNOWN/UNKNOWN"))
         { 
             return avmPath; 
         }
-        
+
         String[] storePath = splitPath(avmPath);
         return tenantService.getName(storePath[0]) + ':' + storePath[1];
     }
@@ -877,11 +877,11 @@ public class MultiTAVMService implements AVMService
     private String getBasePath(String avmPath)
     {
         // note: ALFCOM-2893 - getCommonAncestor can return node with path = "/"
-        if ((avmPath == null) || (! isTenantServiceEnabled()) || (avmPath.equals("/")))
+        if ((avmPath == null) || (! isTenantServiceEnabled()) || (avmPath.equals("/")) || avmPath.equals("UNKNOWN/UNKNOWN"))
         { 
             return avmPath; 
         }
-        
+
         String[] storePath = splitPath(avmPath);
         return tenantService.getBaseName(storePath[0]) + ':' + storePath[1];
     }