diff --git a/config/alfresco/extension/mt/mt-admin-context.xml.sample b/config/alfresco/extension/mt/mt-admin-context.xml.sample
index 288734c26c..0a138f0c35 100644
--- a/config/alfresco/extension/mt/mt-admin-context.xml.sample
+++ b/config/alfresco/extension/mt/mt-admin-context.xml.sample
@@ -3,28 +3,28 @@
 
 <beans>
 
-    <!--
-        Bootstrap Data: Prototype beans for the per-tenant bootstrap.
-        These are fetched by the MultiTAdminServiceImpl when new tenant is created.
-    -->
-    <bean id="userBootstrap-mt" parent="userBootstrap-base" singleton="false" />
-    <bean id="systemBootstrap-mt" parent="systemBootstrap-base" singleton="false" />
-    <bean id="versionBootstrap-mt" parent="versionBootstrap-base" singleton="false" />
-    <bean id="version2Bootstrap-mt" parent="version2Bootstrap-base" singleton="false" />
-    <bean id="spacesArchiveBootstrap-mt" parent="spacesArchiveBootstrap-base" singleton="false" />
-    <bean id="spacesBootstrap-mt" parent="spacesBootstrap-base" singleton="false" />
-    
+    <!--
+        Bootstrap Data: Prototype beans for the per-tenant bootstrap.
+        These are fetched by the MultiTAdminServiceImpl when new tenant is created.
+    -->
+    <bean id="userBootstrap-mt" parent="userBootstrap-base" singleton="false" />
+    <bean id="systemBootstrap-mt" parent="systemBootstrap-base" singleton="false" />
+    <bean id="versionBootstrap-mt" parent="versionBootstrap-base" singleton="false" />
+    <bean id="version2Bootstrap-mt" parent="version2Bootstrap-base" singleton="false" />
+    <bean id="spacesArchiveBootstrap-mt" parent="spacesArchiveBootstrap-base" singleton="false" />
+    <bean id="spacesBootstrap-mt" parent="spacesBootstrap-base" singleton="false" />
+    
    <!--                                           -->
    <!-- MT Admin Service Implementation -->
    <!--                                           -->
             
    <bean id="tenantAdminService" parent="baseMultiTAdminService" />
                 
-   <bean id="tenantInterpreter" class="org.alfresco.repo.tenant.TenantInterpreter" parent="interpreterBase">
-        <property name="tenantAdminService" ref="tenantAdminService"/>       
-        <property name="tenantService" ref="tenantService"/>        
+   <bean id="tenantInterpreter" class="org.alfresco.repo.tenant.TenantInterpreter" parent="interpreterBase">
+        <property name="tenantAdminService" ref="tenantAdminService"/>
+        <property name="tenantService" ref="tenantService"/>
         <property name="authenticationService" ref="AuthenticationService"/>
-        <property name="baseAdminUsername"><value>${alfresco_user_store.adminusername}</value></property>
+        <property name="baseAdminUsername"><value>${alfresco_user_store.adminusername}</value></property>
    </bean>
 
    <bean id="tenantInterpreterHelp" class="org.alfresco.i18n.ResourceBundleBootstrapComponent">
diff --git a/config/alfresco/extension/mt/mt-contentstore-context.xml.sample b/config/alfresco/extension/mt/mt-contentstore-context.xml.sample
index 3bedb869f1..a67ea46342 100644
--- a/config/alfresco/extension/mt/mt-contentstore-context.xml.sample
+++ b/config/alfresco/extension/mt/mt-contentstore-context.xml.sample
@@ -2,61 +2,64 @@
 <!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
 
 <beans>
-
-   <!-- ======================================= -->
-   <!-- Tenant Routing File Content Store Cache -->
-   <!-- ======================================= -->
-   
-   <bean name="tenantFileStoresCache" class="org.alfresco.repo.cache.EhCacheAdapter">
-      <property name="cache">
-         <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean" >
-            <property name="cacheManager">
-               <ref bean="internalEHCacheManager" />
-            </property>
-            <property name="cacheName">
-               <value>org.alfresco.cache.tenantFileStoresCache</value>
-            </property>
-         </bean>
-      </property>
-   </bean>
-   
-   <!--                                   -->
-   <!-- Tenant Routing File Content Store -->
-   <!--                                   -->
-   
-   <bean id="tenantFileContentStore" class="org.alfresco.repo.content.TenantRoutingFileContentStore" init-method="init">
-      <property name="defaultRootDir">
-         <value>${dir.contentstore}</value>
-      </property>
-      <property name="tenantService">
-         <ref bean="tenantService" />
-      </property>
-      <property name="storesCache">
-         <ref bean="tenantFileStoresCache" />
-      </property>    
-   </bean>
-   
-   <!-- override content store cleaner to use tenant routing file content store -->
-   <!-- Performs the content cleanup -->
+
+   <!-- ======================================= -->
+   <!-- Tenant Routing File Content Store Cache -->
+   <!-- ======================================= -->
+   
+   <bean name="tenantFileStoresCache" class="org.alfresco.repo.cache.EhCacheAdapter">
+      <property name="cache">
+         <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean" >
+            <property name="cacheManager">
+               <ref bean="internalEHCacheManager" />
+            </property>
+            <property name="cacheName">
+               <value>org.alfresco.cache.tenantFileStoresCache</value>
+            </property>
+         </bean>
+      </property>
+   </bean>
+   
+   <!--                                   -->
+   <!-- Tenant Routing File Content Store -->
+   <!--                                   -->
+   
+   <bean id="tenantFileContentStore" class="org.alfresco.repo.content.TenantRoutingFileContentStore" init-method="init">
+      <property name="applicationEventPublisher">
+         <ref bean="applicationEventPublisher" />
+      </property>
+      <property name="defaultRootDir">
+         <value>${dir.contentstore}</value>
+      </property>
+      <property name="tenantService">
+         <ref bean="tenantService" />
+      </property>
+      <property name="storesCache">
+         <ref bean="tenantFileStoresCache" />
+      </property>    
+   </bean>
+   
+   <!-- override content store cleaner to use tenant routing file content store -->
+   <!-- Performs the content cleanup -->
    <bean id="eagerContentStoreCleaner" class="org.alfresco.repo.content.cleanup.EagerContentStoreCleaner" init-method="init">
       <property name="eagerOrphanCleanup" >
          <value>${system.content.eagerOrphanCleanup}</value>
       </property>
-      <property name="stores" >
-         <list>
-            <ref bean="tenantFileContentStore" />
-         </list>
-      </property>
+      <property name="stores" >
+         <list>
+            <ref bean="tenantFileContentStore" />
+         </list>
+      </property>
       <property name="listeners" >
          <ref bean="deletedContentBackupListeners" />
       </property>
-   </bean>
-
-   <!-- override content service to use tenant routing file content store -->
-   <bean id="contentService" parent="baseContentService">
-      <property name="store">
-          <ref bean="tenantFileContentStore" />
-      </property>
+   </bean>
+
+   <!-- override content service to use tenant routing file content store -->
+   <bean id="contentService" parent="baseContentService">
+      <property name="store">
+          <ref bean="tenantFileContentStore" />
+      </property>
    </bean>
        
 </beans>
diff --git a/source/test-resources/tenant/mt-admin-context.xml b/source/test-resources/tenant/mt-admin-context.xml
index 14049f5f55..0a138f0c35 100644
--- a/source/test-resources/tenant/mt-admin-context.xml
+++ b/source/test-resources/tenant/mt-admin-context.xml
@@ -21,9 +21,10 @@
    <bean id="tenantAdminService" parent="baseMultiTAdminService" />
                 
    <bean id="tenantInterpreter" class="org.alfresco.repo.tenant.TenantInterpreter" parent="interpreterBase">
-        <property name="tenantAdminService" ref="tenantAdminService"/>   
-        <property name="tenantService" ref="tenantService"/>     
+        <property name="tenantAdminService" ref="tenantAdminService"/>
+        <property name="tenantService" ref="tenantService"/>
         <property name="authenticationService" ref="AuthenticationService"/>
+        <property name="baseAdminUsername"><value>${alfresco_user_store.adminusername}</value></property>
    </bean>
 
    <bean id="tenantInterpreterHelp" class="org.alfresco.i18n.ResourceBundleBootstrapComponent">
@@ -34,4 +35,4 @@
         </property>
    </bean>
    
-</beans>
\ No newline at end of file
+</beans>
diff --git a/source/test-resources/tenant/mt-contentstore-context.xml b/source/test-resources/tenant/mt-contentstore-context.xml
index 09b84df820..a67ea46342 100644
--- a/source/test-resources/tenant/mt-contentstore-context.xml
+++ b/source/test-resources/tenant/mt-contentstore-context.xml
@@ -2,64 +2,64 @@
 <!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
 
 <beans>
-
-   <!-- ======================================= -->
-   <!-- Tenant Routing File Content Store Cache -->
-   <!-- ======================================= -->
-   
-   <bean name="tenantFileStoresCache" class="org.alfresco.repo.cache.EhCacheAdapter">
-      <property name="cache">
-         <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean" >
-            <property name="cacheManager">
-               <ref bean="internalEHCacheManager" />
-            </property>
-            <property name="cacheName">
-               <value>org.alfresco.cache.tenantFileStoresCache</value>
-            </property>
-         </bean>
-      </property>
-   </bean>
-   
-   <!--                                   -->
-   <!-- Tenant Routing File Content Store -->
-   <!--                                   -->
-   
-   <bean id="tenantFileContentStore" class="org.alfresco.repo.content.TenantRoutingFileContentStore" init-method="init">
+
+   <!-- ======================================= -->
+   <!-- Tenant Routing File Content Store Cache -->
+   <!-- ======================================= -->
+   
+   <bean name="tenantFileStoresCache" class="org.alfresco.repo.cache.EhCacheAdapter">
+      <property name="cache">
+         <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean" >
+            <property name="cacheManager">
+               <ref bean="internalEHCacheManager" />
+            </property>
+            <property name="cacheName">
+               <value>org.alfresco.cache.tenantFileStoresCache</value>
+            </property>
+         </bean>
+      </property>
+   </bean>
+   
+   <!--                                   -->
+   <!-- Tenant Routing File Content Store -->
+   <!--                                   -->
+   
+   <bean id="tenantFileContentStore" class="org.alfresco.repo.content.TenantRoutingFileContentStore" init-method="init">
       <property name="applicationEventPublisher">
          <ref bean="applicationEventPublisher" />
+      </property>
+      <property name="defaultRootDir">
+         <value>${dir.contentstore}</value>
+      </property>
+      <property name="tenantService">
+         <ref bean="tenantService" />
+      </property>
+      <property name="storesCache">
+         <ref bean="tenantFileStoresCache" />
       </property>    
-      <property name="defaultRootDir">
-         <value>${dir.contentstore}</value>
-      </property>
-      <property name="tenantService">
-         <ref bean="tenantService" />
-      </property>
-      <property name="storesCache">
-         <ref bean="tenantFileStoresCache" />
-      </property>    
-   </bean>
-   
-   <!-- override content store cleaner to use tenant routing file content store -->
-   <!-- Performs the content cleanup -->
+   </bean>
+   
+   <!-- override content store cleaner to use tenant routing file content store -->
+   <!-- Performs the content cleanup -->
    <bean id="eagerContentStoreCleaner" class="org.alfresco.repo.content.cleanup.EagerContentStoreCleaner" init-method="init">
       <property name="eagerOrphanCleanup" >
          <value>${system.content.eagerOrphanCleanup}</value>
       </property>
-      <property name="stores" >
-         <list>
-            <ref bean="tenantFileContentStore" />
-         </list>
-      </property>
+      <property name="stores" >
+         <list>
+            <ref bean="tenantFileContentStore" />
+         </list>
+      </property>
       <property name="listeners" >
          <ref bean="deletedContentBackupListeners" />
       </property>
-   </bean>
-
-   <!-- override content service to use tenant routing file content store -->
-   <bean id="contentService" parent="baseContentService">
-      <property name="store">
-          <ref bean="tenantFileContentStore" />
-      </property>
+   </bean>
+
+   <!-- override content service to use tenant routing file content store -->
+   <bean id="contentService" parent="baseContentService">
+      <property name="store">
+          <ref bean="tenantFileContentStore" />
+      </property>
    </bean>
        
 </beans>