diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
index 40c4434610..ec5fe2d051 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
@@ -375,10 +375,10 @@
 
     <!--  File Plan Service -->
 
-  <bean id="rootContainerCache" class="org.alfresco.repo.cache.DefaultSimpleCache" />
+	<bean id="rootContainerCache" class="org.alfresco.repo.cache.DefaultSimpleCache" />
 
-  <bean id="filePlanService"
-        parent="baseService"
+	<bean id="filePlanService"
+	      parent="baseService"
           class="org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanServiceImpl">
         <property name="rootContainerCache" ref="rootContainerCache" />
     </bean>
@@ -568,9 +568,9 @@
           parent="baseService">
         <property name="nodeService" ref="nodeService"/>
         <property name="filePlanService" ref="filePlanService" />
-        <property name="filePlanRoleService" ref="filePlanRoleService" />
-        <property name="authorityService" ref="authorityService"/>
-        <property name="permissionService" ref="permissionService"/>
+        <property name="filePlanRoleService" ref="filePlanRoleService" />        
+        <property name="authorityService" ref="authorityService"/>        
+        <property name="permissionService" ref="permissionService"/>   
         <property name="transactionService" ref="transactionService"/>
     </bean>
 
@@ -1062,8 +1062,8 @@
     </bean>
 
     <bean id="recordMetadataAspectBootstrap" class="org.alfresco.module.org_alfresco_module_rm.record.RecordMetadataBootstrap" init-method="init" abstract="true">
-      <property name="recordService" ref="recordService"/>
-      <property name="namespaceService" ref="namespaceService"/>
+    	<property name="recordService" ref="recordService"/>
+    	<property name="namespaceService" ref="namespaceService"/>
     </bean>
 
     <bean id="RecordService" class="org.springframework.aop.framework.ProxyFactoryBean">
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java
index 9368c467d6..f446e767ec 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java
@@ -77,8 +77,8 @@ public class RmSiteType extends    BaseBehaviourBean
                                    NodeServicePolicies.BeforeDeleteNodePolicy,
                                    NodeServicePolicies.OnCreateChildAssociationPolicy
 {
-    /** Constant values */
-    public static final String COMPONENT_DOCUMENT_LIBRARY = "documentLibrary";
+	/** Constant values */
+	public static final String COMPONENT_DOCUMENT_LIBRARY = "documentLibrary";
     public static final String DEFAULT_SITE_NAME = "rm";
     public static final QName DEFAULT_FILE_PLAN_TYPE = TYPE_FILE_PLAN;
 
@@ -103,8 +103,8 @@ public class RmSiteType extends    BaseBehaviourBean
      */
     public void setSiteService(SiteService siteService)
     {
-        this.siteService = siteService;
-    }
+		this.siteService = siteService;
+	}
 
     /**
      * @param recordsManagementSearchService    records management search service
@@ -139,39 +139,39 @@ public class RmSiteType extends    BaseBehaviourBean
      */
     public void registerFilePlanType(QName siteType, QName filePlanType)
     {
-        ParameterCheck.mandatory("siteType", siteType);
-        ParameterCheck.mandatory("filePlanType", filePlanType);
+    	ParameterCheck.mandatory("siteType", siteType);
+    	ParameterCheck.mandatory("filePlanType", filePlanType);
 
-        // check that the registered site type is a subtype of rma:rmsite
-        if (!dictionaryService.isSubClass(siteType, TYPE_RM_SITE))
-        {
-            throw new AlfrescoRuntimeException(
-                    "Can't register site type, because site type is not a sub type of rma:rmsite (siteType=" + siteType.toString() + ")");
-        }
+    	// check that the registered site type is a subtype of rma:rmsite
+    	if (!dictionaryService.isSubClass(siteType, TYPE_RM_SITE))
+    	{
+    		throw new AlfrescoRuntimeException(
+    				"Can't register site type, because site type is not a sub type of rma:rmsite (siteType=" + siteType.toString() + ")");
+    	}
 
-        // check that the registered file plan type is a sub type of rma:filePlan
-        if (!dictionaryService.isSubClass(filePlanType, TYPE_FILE_PLAN))
-        {
-            throw new AlfrescoRuntimeException(
-                    "Can't register file plan type, because site type is not a sub type of rma:filePlan (filePlanType=" + filePlanType.toString() + ")");
-        }
+    	// check that the registered file plan type is a sub type of rma:filePlan
+    	if (!dictionaryService.isSubClass(filePlanType, TYPE_FILE_PLAN))
+    	{
+    		throw new AlfrescoRuntimeException(
+    				"Can't register file plan type, because site type is not a sub type of rma:filePlan (filePlanType=" + filePlanType.toString() + ")");
+    	}
 
-        // add site and file plan types to map
-        mapFilePlanType.put(siteType, filePlanType);
+    	// add site and file plan types to map
+    	mapFilePlanType.put(siteType, filePlanType);
     }
 
     /**
      * @see org.alfresco.repo.node.NodeServicePolicies.OnCreateNodePolicy#onCreateNode(org.alfresco.service.cmr.repository.ChildAssociationRef)
      */
-    @Override
-    @Behaviour
-    (
-            kind = BehaviourKind.CLASS,
-            notificationFrequency = NotificationFrequency.FIRST_EVENT
-    )
-    public void onCreateNode(ChildAssociationRef childAssocRef)
-    {
-        final NodeRef rmSite = childAssocRef.getChildRef();
+	@Override
+	@Behaviour
+	(
+	        kind = BehaviourKind.CLASS,
+	        notificationFrequency = NotificationFrequency.FIRST_EVENT
+	)
+	public void onCreateNode(ChildAssociationRef childAssocRef)
+	{
+		final NodeRef rmSite = childAssocRef.getChildRef();
 
         // Do not execute behaviour if this has been created in the archive store
         if(rmSite.getStoreRef().equals(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE))
@@ -186,52 +186,52 @@ public class RmSiteType extends    BaseBehaviourBean
             {
                 public Object doWork()
                 {
-                    SiteInfo siteInfo = siteService.getSite(rmSite);
-                    if (siteInfo != null)
-                    {
-                        // Create the file plan component
-                        siteService.createContainer(siteInfo.getShortName(), COMPONENT_DOCUMENT_LIBRARY, getFilePlanType(siteInfo), null);
+                	SiteInfo siteInfo = siteService.getSite(rmSite);
+                	if (siteInfo != null)
+                	{
+	                	// Create the file plan component
+	                	siteService.createContainer(siteInfo.getShortName(), COMPONENT_DOCUMENT_LIBRARY, getFilePlanType(siteInfo), null);
 
-                        // Add the reports
-                        recordsManagementSearchService.addReports(siteInfo.getShortName());
-                    }
+	                	// Add the reports
+	                	recordsManagementSearchService.addReports(siteInfo.getShortName());
+                	}
                     return null;
                 }
             }, AuthenticationUtil.getAdminUserName());
         }
-    }
+	}
 
-    /**
-     * Get the file plan type for the given site.
-     *
-     * @param siteInfo	site info
-     * @return QName	file plan type to create as a container
-     * @since 2.2
-     */
-    private QName getFilePlanType(SiteInfo siteInfo)
-    {
-        ParameterCheck.mandatory("siteInfo", siteInfo);
+	/**
+	 * Get the file plan type for the given site.
+	 *
+	 * @param siteInfo	site info
+	 * @return QName	file plan type to create as a container
+	 * @since 2.2
+	 */
+	private QName getFilePlanType(SiteInfo siteInfo)
+	{
+		ParameterCheck.mandatory("siteInfo", siteInfo);
 
-        // set default file plan
-        QName result = DEFAULT_FILE_PLAN_TYPE;
+		// set default file plan
+		QName result = DEFAULT_FILE_PLAN_TYPE;
 
-        // check to see if there is an 'override' for the file plan type given the site type
-        QName siteType = nodeService.getType(siteInfo.getNodeRef());
-        if (mapFilePlanType.containsKey(siteType))
-        {
-            result = mapFilePlanType.get(siteType);
-        }
+		// check to see if there is an 'override' for the file plan type given the site type
+		QName siteType = nodeService.getType(siteInfo.getNodeRef());
+		if (mapFilePlanType.containsKey(siteType))
+		{
+			result = mapFilePlanType.get(siteType);
+		}
 
-        return result;
-    }
+		return result;
+	}
 
-    /**
-     * Ensure that the visibility of a RM site can not be changed to anything but public.
-     *
-     * TODO support other site visibilities
-     *
-     * @see org.alfresco.repo.node.NodeServicePolicies.OnUpdatePropertiesPolicy#onUpdateProperties(org.alfresco.service.cmr.repository.NodeRef, java.util.Map, java.util.Map)
-     */
+	/**
+	 * Ensure that the visibility of a RM site can not be changed to anything but public.
+	 *
+	 * TODO support other site visibilities
+	 *
+	 * @see org.alfresco.repo.node.NodeServicePolicies.OnUpdatePropertiesPolicy#onUpdateProperties(org.alfresco.service.cmr.repository.NodeRef, java.util.Map, java.util.Map)
+	 */
     @Behaviour
     (
             kind = BehaviourKind.CLASS,
diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImplUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImplUnitTest.java
index 0a82499e08..169a6bc694 100644
--- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImplUnitTest.java
+++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImplUnitTest.java
@@ -61,7 +61,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
-import org.mockito.Mock;
 import org.mockito.Spy;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
@@ -83,9 +82,6 @@ public class HoldServiceImplUnitTest extends BaseUnitTest
     protected NodeRef hold;
     protected NodeRef hold2;
 
-    @Mock
-    private HoldType mockedHoldType;
-
     @Spy @InjectMocks HoldServiceImpl holdService;
 
     @Before