diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml
index d82e9ef861..0453a26594 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml
@@ -2,495 +2,498 @@
 <!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
 
 <beans>
-	<!-- REST impl for RM Action Service -->
-	<bean id="webscript.org.alfresco.rma.rmaction.post"
-		class="org.alfresco.module.org_alfresco_module_rm.script.RmActionPost"
-		parent="webscript">
-		<property name="recordsManagementActionService" ref="RecordsManagementActionService" />
-		<property name="nodeService" ref="NodeService" />
-	</bean>
+   <!-- REST impl for RM Action Service -->
+   <bean id="webscript.org.alfresco.rma.rmaction.post"
+      class="org.alfresco.module.org_alfresco_module_rm.script.RmActionPost"
+      parent="webscript">
+      <property name="recordsManagementActionService" ref="RecordsManagementActionService" />
+      <property name="nodeService" ref="NodeService" />
+   </bean>
 
-	<!-- Abstract parent bean for many RM get and post beans -->
-	<bean id="rmBaseWebscript" parent="webscript" abstract="true">
-		<property name="nodeService" ref="NodeService" />
-		<property name="namespaceService" ref="NamespaceService" />
-		<property name="recordsManagementService" ref="RecordsManagementService" />
-		<property name="dispositionService" ref="DispositionService" />
-	</bean>
+   <!-- Abstract parent bean for many RM get and post beans -->
+   <bean id="rmBaseWebscript" parent="webscript" abstract="true">
+      <property name="nodeService" ref="NodeService" />
+      <property name="namespaceService" ref="NamespaceService" />
+      <property name="recordsManagementService" ref="RecordsManagementService" />
+      <property name="dispositionService" ref="DispositionService" />
+   </bean>
 
-	<!-- REST impl for GET DOD Custom Types -->
-	<bean id="webscript.org.alfresco.rma.dodcustomtypes.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.DodCustomTypesGet"
-		parent="webscript">
-		<property name="dictionaryService" ref="DictionaryService" />
-	</bean>
+   <!-- REST impl for GET DOD Custom Types -->
+   <bean id="webscript.org.alfresco.rma.dodcustomtypes.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.DodCustomTypesGet"
+      parent="webscript">
+      <property name="dictionaryService" ref="DictionaryService" />
+   </bean>
 
-	<bean id="webscript.org.alfresco.rma.customisable.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.CustomisableGet"
-		parent="webscript">
-		<property name="recordsManagementAdminService" ref="RecordsManagementAdminService" />
-		<property name="namespaceService" ref="NamespaceService" />
-		<property name="dictionaryService" ref="DictionaryService" />
-	</bean>
+   <bean id="webscript.org.alfresco.rma.customisable.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.CustomisableGet"
+      parent="webscript">
+      <property name="recordsManagementAdminService" ref="RecordsManagementAdminService" />
+      <property name="namespaceService" ref="NamespaceService" />
+      <property name="dictionaryService" ref="DictionaryService" />
+   </bean>
 
-	<!-- REST impl for GET Custom Property Definitions -->
-	<bean id="webscript.org.alfresco.rma.custompropdefinitions.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.CustomPropertyDefinitionsGet"
-		parent="rmBaseWebscript">
-		<property name="recordsManagementAdminService" ref="RecordsManagementAdminService" />
-	</bean>
+   <!-- REST impl for GET Custom Property Definitions -->
+   <bean id="webscript.org.alfresco.rma.custompropdefinitions.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.CustomPropertyDefinitionsGet"
+      parent="rmBaseWebscript">
+      <property name="recordsManagementAdminService" ref="RecordsManagementAdminService" />
+   </bean>
 
-	<!-- REST impl for PUT Custom Property Definitions -->
-	<bean id="webscript.org.alfresco.rma.custompropdefinition.put"
-		class="org.alfresco.module.org_alfresco_module_rm.script.CustomPropertyDefinitionPut"
-		parent="rmBaseWebscript">
-		<property name="recordsManagementAdminService" ref="RecordsManagementAdminService" />
-	</bean>
+   <!-- REST impl for PUT Custom Property Definitions -->
+   <bean id="webscript.org.alfresco.rma.custompropdefinition.put"
+      class="org.alfresco.module.org_alfresco_module_rm.script.CustomPropertyDefinitionPut"
+      parent="rmBaseWebscript">
+      <property name="recordsManagementAdminService" ref="RecordsManagementAdminService" />
+   </bean>
 
-	<!-- REST impl for POST Custom Property Definitions -->
-	<bean id="webscript.org.alfresco.rma.custompropdefinition.post"
-		class="org.alfresco.module.org_alfresco_module_rm.script.CustomPropertyDefinitionPost"
-		parent="rmBaseWebscript">
-		<property name="recordsManagementAdminService" ref="RecordsManagementAdminService" />
-	</bean>
+   <!-- REST impl for POST Custom Property Definitions -->
+   <bean id="webscript.org.alfresco.rma.custompropdefinition.post"
+      class="org.alfresco.module.org_alfresco_module_rm.script.CustomPropertyDefinitionPost"
+      parent="rmBaseWebscript">
+      <property name="recordsManagementAdminService" ref="RecordsManagementAdminService" />
+   </bean>
 
-	<!-- TODO Delete this -->
-	<!-- REST impl for DELETE Custom Property Definitions -->
-	<bean id="webscript.org.alfresco.rma.custompropdefinition.delete"
-		class="org.alfresco.module.org_alfresco_module_rm.script.CustomPropertyDefinitionDelete"
-		parent="rmBaseWebscript">
-		<property name="recordsManagementAdminService" ref="RecordsManagementAdminService" />
-	</bean>
+   <!-- TODO Delete this -->
+   <!-- REST impl for DELETE Custom Property Definitions -->
+   <bean id="webscript.org.alfresco.rma.custompropdefinition.delete"
+      class="org.alfresco.module.org_alfresco_module_rm.script.CustomPropertyDefinitionDelete"
+      parent="rmBaseWebscript">
+      <property name="recordsManagementAdminService" ref="RecordsManagementAdminService" />
+   </bean>
 
-	<!-- REST impl for GET Custom Reference Definitions -->
-	<bean id="webscript.org.alfresco.rma.customrefdefinitions.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.CustomReferenceDefinitionsGet"
-		parent="webscript">
-		<property name="recordsManagementAdminService" ref="RecordsManagementAdminService" />
-		<property name="namespaceService" ref="NamespaceService" />
-	</bean>
+   <!-- REST impl for GET Custom Reference Definitions -->
+   <bean id="webscript.org.alfresco.rma.customrefdefinitions.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.CustomReferenceDefinitionsGet"
+      parent="webscript">
+      <property name="recordsManagementAdminService" ref="RecordsManagementAdminService" />
+      <property name="namespaceService" ref="NamespaceService" />
+   </bean>
 
-	<!-- REST impl for PUT Custom Reference Definitions -->
-	<bean id="webscript.org.alfresco.rma.customrefdefinition.put"
-		class="org.alfresco.module.org_alfresco_module_rm.script.CustomReferenceDefinitionPut"
-		parent="rmBaseWebscript">
-		<property name="recordsManagementAdminService" ref="RecordsManagementAdminService" />
-	</bean>
+   <!-- REST impl for PUT Custom Reference Definitions -->
+   <bean id="webscript.org.alfresco.rma.customrefdefinition.put"
+      class="org.alfresco.module.org_alfresco_module_rm.script.CustomReferenceDefinitionPut"
+      parent="rmBaseWebscript">
+      <property name="recordsManagementAdminService" ref="RecordsManagementAdminService" />
+   </bean>
 
-	<!-- REST impl for POST Custom Reference Definitions -->
-	<bean id="webscript.org.alfresco.rma.customrefdefinition.post"
-		class="org.alfresco.module.org_alfresco_module_rm.script.CustomReferenceDefinitionPost"
-		parent="rmBaseWebscript">
-		<property name="recordsManagementAdminService" ref="RecordsManagementAdminService" />
-	</bean>
+   <!-- REST impl for POST Custom Reference Definitions -->
+   <bean id="webscript.org.alfresco.rma.customrefdefinition.post"
+      class="org.alfresco.module.org_alfresco_module_rm.script.CustomReferenceDefinitionPost"
+      parent="rmBaseWebscript">
+      <property name="recordsManagementAdminService" ref="RecordsManagementAdminService" />
+   </bean>
 
-	<!-- REST impl for GET Custom Reference Instances -->
-	<bean id="webscript.org.alfresco.rma.customrefs.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.CustomRefsGet"
-		parent="rmBaseWebscript">
-		<property name="recordsManagementAdminService" ref="RecordsManagementAdminService" />
-	</bean>
+   <!-- REST impl for GET Custom Reference Instances -->
+   <bean id="webscript.org.alfresco.rma.customrefs.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.CustomRefsGet"
+      parent="rmBaseWebscript">
+      <property name="recordsManagementAdminService" ref="RecordsManagementAdminService" />
+   </bean>
 
-	<!-- REST impl for POST Custom Reference Instance -->
-	<bean id="webscript.org.alfresco.rma.customref.post"
-		class="org.alfresco.module.org_alfresco_module_rm.script.CustomRefPost"
-		parent="rmBaseWebscript">
-		<property name="recordsManagementAdminService" ref="RecordsManagementAdminService" />
-	</bean>
+   <!-- REST impl for POST Custom Reference Instance -->
+   <bean id="webscript.org.alfresco.rma.customref.post"
+      class="org.alfresco.module.org_alfresco_module_rm.script.CustomRefPost"
+      parent="rmBaseWebscript">
+      <property name="recordsManagementAdminService" ref="RecordsManagementAdminService" />
+   </bean>
 
-	<!-- REST impl for DELETE Custom Reference Instance -->
-	<bean id="webscript.org.alfresco.rma.customref.delete"
-		class="org.alfresco.module.org_alfresco_module_rm.script.CustomRefDelete"
-		parent="rmBaseWebscript">
-		<property name="recordsManagementAdminService" ref="RecordsManagementAdminService" />
-	</bean>
+   <!-- REST impl for DELETE Custom Reference Instance -->
+   <bean id="webscript.org.alfresco.rma.customref.delete"
+      class="org.alfresco.module.org_alfresco_module_rm.script.CustomRefDelete"
+      parent="rmBaseWebscript">
+      <property name="recordsManagementAdminService" ref="RecordsManagementAdminService" />
+   </bean>
 
-	<!-- REST impl for GET Disposition Schedule -->
-	<bean id="webscript.org.alfresco.rma.dispositionschedule.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.DispositionScheduleGet"
-		parent="rmBaseWebscript">
-	</bean>
+   <!-- REST impl for GET Disposition Schedule -->
+   <bean id="webscript.org.alfresco.rma.dispositionschedule.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.DispositionScheduleGet"
+      parent="rmBaseWebscript">
+   </bean>
 
-	<!-- REST impl for POST Disposition Action Definition -->
-	<bean id="webscript.org.alfresco.rma.dispositionactiondefinitions.post"
-		class="org.alfresco.module.org_alfresco_module_rm.script.DispositionActionDefinitionPost"
-		parent="rmBaseWebscript">
-	</bean>
+   <!-- REST impl for POST Disposition Action Definition -->
+   <bean id="webscript.org.alfresco.rma.dispositionactiondefinitions.post"
+      class="org.alfresco.module.org_alfresco_module_rm.script.DispositionActionDefinitionPost"
+      parent="rmBaseWebscript">
+   </bean>
 
-	<!-- REST impl for PUT Disposition Action Definition -->
-	<bean id="webscript.org.alfresco.rma.dispositionactiondefinition.put"
-		class="org.alfresco.module.org_alfresco_module_rm.script.DispositionActionDefinitionPut"
-		parent="rmBaseWebscript">
-	</bean>
+   <!-- REST impl for PUT Disposition Action Definition -->
+   <bean id="webscript.org.alfresco.rma.dispositionactiondefinition.put"
+      class="org.alfresco.module.org_alfresco_module_rm.script.DispositionActionDefinitionPut"
+      parent="rmBaseWebscript">
+   </bean>
 
-	<!-- REST impl for DELETE Disposition Action Definition -->
-	<bean id="webscript.org.alfresco.rma.dispositionactiondefinition.delete"
-		class="org.alfresco.module.org_alfresco_module_rm.script.DispositionActionDefinitionDelete"
-		parent="rmBaseWebscript">
-	</bean>
+   <!-- REST impl for DELETE Disposition Action Definition -->
+   <bean id="webscript.org.alfresco.rma.dispositionactiondefinition.delete"
+      class="org.alfresco.module.org_alfresco_module_rm.script.DispositionActionDefinitionDelete"
+      parent="rmBaseWebscript">
+   </bean>
 
-	<!-- REST impl for GET Disposition Lifecycle -->
-	<bean id="webscript.org.alfresco.rma.dispositionlifecycle.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.DispositionLifecycleGet"
-		parent="rmBaseWebscript">
-		<property name="personService" ref="PersonService" />
-	</bean>
+   <!-- REST impl for GET Disposition Lifecycle -->
+   <bean id="webscript.org.alfresco.rma.dispositionlifecycle.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.DispositionLifecycleGet"
+      parent="rmBaseWebscript">
+      <property name="personService" ref="PersonService" />
+   </bean>
 
-	<!-- REST impl for GET List Of Values -->
-	<bean id="webscript.org.alfresco.rma.listofvalues.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.ListOfValuesGet"
-		parent="webscript">
-		<property name="recordsManagementService" ref="RecordsManagementService" />
-		<property name="recordsManagementActionService" ref="RecordsManagementActionService" />
-		<property name="recordsManagementAuditService" ref="RecordsManagementAuditService" />
-		<property name="recordsManagementEventService" ref="RecordsManagementEventService" />
-		<property name="dispositionService" ref="DispositionService" />
-		<property name="dictionaryService" ref="DictionaryService" />
-		<property name="namespaceService" ref="NamespaceService" />
-	</bean>
+   <!-- REST impl for GET List Of Values -->
+   <bean id="webscript.org.alfresco.rma.listofvalues.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.ListOfValuesGet"
+      parent="webscript">
+      <property name="recordsManagementService" ref="RecordsManagementService" />
+      <property name="recordsManagementActionService" ref="RecordsManagementActionService" />
+      <property name="recordsManagementAuditService" ref="RecordsManagementAuditService" />
+      <property name="recordsManagementEventService" ref="RecordsManagementEventService" />
+      <property name="dispositionService" ref="DispositionService" />
+      <property name="dictionaryService" ref="DictionaryService" />
+      <property name="namespaceService" ref="NamespaceService" />
+   </bean>
 
-	<!--  REST impl for GET disposition properties -->
-	<bean id="webscript.org.alfresco.rma.dispositionproperties.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.DispositionPropertiesGet"
-		parent="webscript">
-		<property name="dispositionService" ref="DispositionService" />
-		<property name="namespaceService" ref="NamespaceService" />
-	</bean>
+   <!--  REST impl for GET disposition properties -->
+   <bean id="webscript.org.alfresco.rma.dispositionproperties.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.DispositionPropertiesGet"
+      parent="webscript">
+      <property name="dispositionService" ref="DispositionService" />
+      <property name="namespaceService" ref="NamespaceService" />
+   </bean>
 
-	<!--  REST impl for GET Records MetaData aspects -->
-	<bean id="webscript.org.alfresco.rma.recordmetadataaspects.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.RecordMetaDataAspectsGet"
-		parent="webscript">
-		<property name="recordService" ref="RecordService" />
-		<property name="dictionaryService" ref="DictionaryService" />
-		<property name="namespaceService" ref="NamespaceService" />
-	</bean>
+   <!--  REST impl for GET Records MetaData aspects -->
+   <bean id="webscript.org.alfresco.rma.recordmetadataaspects.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.RecordMetaDataAspectsGet"
+      parent="webscript">
+      <property name="recordService" ref="RecordService" />
+      <property name="dictionaryService" ref="DictionaryService" />
+      <property name="namespaceService" ref="NamespaceService" />
+   </bean>
 
-	<!-- REST impl for GET Audit Log -->
-	<bean id="webscript.org.alfresco.rma.rmauditlog.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.AuditLogGet"
-		parent="webscript">
-		<property name="nodeService" ref="nodeService" />
-		<property name="contentService" ref="ContentService" />
-		<property name="permissionService" ref="PermissionService" />
-		<property name="mimetypeService" ref="mimetypeService" />
-		<property name="recordsManagementAuditService" ref="RecordsManagementAuditService" />
-	</bean>
+   <!-- REST impl for GET Audit Log -->
+   <bean id="webscript.org.alfresco.rma.rmauditlog.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.AuditLogGet"
+      parent="webscript">
+      <property name="nodeService" ref="nodeService" />
+      <property name="contentService" ref="ContentService" />
+      <property name="permissionService" ref="PermissionService" />
+      <property name="mimetypeService" ref="mimetypeService" />
+      <property name="recordsManagementAuditService" ref="RecordsManagementAuditService" />
+   </bean>
 
-	<bean id="webscript.org.alfresco.rma.rmauditlogstatus.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.AuditLogStatusGet"
-		parent="webscript">
-		<property name="recordsManagementAuditService" ref="RecordsManagementAuditService" />
-	</bean>
+   <bean id="webscript.org.alfresco.rma.rmauditlogstatus.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.AuditLogStatusGet"
+      parent="webscript">
+      <property name="recordsManagementAuditService" ref="RecordsManagementAuditService" />
+   </bean>
 
-	<!-- REST impl for POST Audit Log -->
-	<bean id="webscript.org.alfresco.rma.rmauditlog.post"
-		class="org.alfresco.module.org_alfresco_module_rm.script.AuditLogPost"
-		parent="webscript">
-		<property name="nodeService" ref="nodeService" />
-		<property name="contentService" ref="ContentService" />
-		<property name="permissionService" ref="PermissionService" />
-		<property name="mimetypeService" ref="mimetypeService" />
-		<property name="recordsManagementAuditService" ref="RecordsManagementAuditService" />
-	</bean>
+   <!-- REST impl for POST Audit Log -->
+   <bean id="webscript.org.alfresco.rma.rmauditlog.post"
+      class="org.alfresco.module.org_alfresco_module_rm.script.AuditLogPost"
+      parent="webscript">
+      <property name="nodeService" ref="nodeService" />
+      <property name="contentService" ref="ContentService" />
+      <property name="permissionService" ref="PermissionService" />
+      <property name="mimetypeService" ref="mimetypeService" />
+      <property name="recordsManagementAuditService" ref="RecordsManagementAuditService" />
+   </bean>
 
-	<!-- REST impl for PUT Audit Log (starting and stopping auditing) -->
-	<bean id="webscript.org.alfresco.rma.rmauditlog.put"
-		class="org.alfresco.module.org_alfresco_module_rm.script.AuditLogPut"
-		parent="webscript">
-		<property name="recordsManagementAuditService" ref="RecordsManagementAuditService" />
-	</bean>
+   <!-- REST impl for PUT Audit Log (starting and stopping auditing) -->
+   <bean id="webscript.org.alfresco.rma.rmauditlog.put"
+      class="org.alfresco.module.org_alfresco_module_rm.script.AuditLogPut"
+      parent="webscript">
+      <property name="recordsManagementAuditService" ref="RecordsManagementAuditService" />
+   </bean>
 
-	<!-- REST impl for DELETE Audit Log (clears audit log) -->
-	<bean id="webscript.org.alfresco.rma.rmauditlog.delete"
-		class="org.alfresco.module.org_alfresco_module_rm.script.AuditLogDelete"
-		parent="webscript">
-		<property name="recordsManagementAuditService" ref="RecordsManagementAuditService" />
-	</bean>
+   <!-- REST impl for DELETE Audit Log (clears audit log) -->
+   <bean id="webscript.org.alfresco.rma.rmauditlog.delete"
+      class="org.alfresco.module.org_alfresco_module_rm.script.AuditLogDelete"
+      parent="webscript">
+      <property name="recordsManagementAuditService" ref="RecordsManagementAuditService" />
+   </bean>
 
-	<!-- REST impl for POST export -->
-	<bean id="webscript.org.alfresco.rma.export.post"
-		class="org.alfresco.module.org_alfresco_module_rm.script.ExportPost"
-		parent="webscript">
-		<property name="nodeService" ref="nodeService" />
-		<property name="contentService" ref="ContentService" />
-		<property name="permissionService" ref="PermissionService" />
-		<property name="mimetypeService" ref="mimetypeService" />
-		<property name="exporterService" ref="ExporterService" />
-	</bean>
+   <!-- REST impl for POST export -->
+   <bean id="webscript.org.alfresco.rma.export.post"
+      class="org.alfresco.module.org_alfresco_module_rm.script.ExportPost"
+      parent="webscript">
+      <property name="nodeService" ref="nodeService" />
+      <property name="contentService" ref="ContentService" />
+      <property name="permissionService" ref="PermissionService" />
+      <property name="mimetypeService" ref="mimetypeService" />
+      <property name="exporterService" ref="ExporterService" />
+   </bean>
 
-	<!-- REST impl for POST import -->
-	<bean id="webscript.org.alfresco.rma.import.post"
-		class="org.alfresco.module.org_alfresco_module_rm.script.ImportPost"
-		parent="webscript">
-		<property name="nodeService" ref="NodeService" />
-		<property name="dictionaryService" ref="DictionaryService" />
-		<property name="importerService" ref="ImporterService" />
-		<property name="recordsManagementService" ref="RecordsManagementService" />
-		<property name="recordsManagementSecurityService" ref="RecordsManagementSecurityService" />
-	</bean>
+   <!-- REST impl for POST import -->
+   <bean id="webscript.org.alfresco.rma.import.post"
+      class="org.alfresco.module.org_alfresco_module_rm.script.ImportPost"
+      parent="webscript">
+      <property name="nodeService" ref="NodeService" />
+      <property name="dictionaryService" ref="DictionaryService" />
+      <property name="importerService" ref="ImporterService" />
+      <property name="recordsManagementService" ref="RecordsManagementService" />
+      <property name="recordsManagementSecurityService" ref="RecordsManagementSecurityService" />
+   </bean>
 
-	<!-- Base bean for transfer web scripts -->
-	<bean id="rmBaseTransferWebscript" parent="webscript" abstract="true">
-		<property name="nodeService" ref="nodeService" />
-		<property name="contentService" ref="ContentService" />
-		<property name="permissionService" ref="PermissionService" />
-		<property name="mimetypeService" ref="mimetypeService" />
-		<property name="exporterService" ref="ExporterService" />
-	</bean>
+   <!-- Base bean for transfer web scripts -->
+   <bean id="rmBaseTransferWebscript" parent="webscript" abstract="true">
+      <property name="nodeService" ref="nodeService" />
+      <property name="contentService" ref="ContentService" />
+      <property name="permissionService" ref="PermissionService" />
+      <property name="mimetypeService" ref="mimetypeService" />
+      <property name="exporterService" ref="ExporterService" />
+   </bean>
 
-	<!-- REST impl for GET transfer -->
-	<bean id="webscript.org.alfresco.rma.transfer.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.TransferGet"
-		parent="rmBaseTransferWebscript">
-	</bean>
+   <!-- REST impl for GET transfer -->
+   <bean id="webscript.org.alfresco.rma.transfer.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.TransferGet"
+      parent="rmBaseTransferWebscript">
+   </bean>
 
-	<!-- REST impl for GET transfer report -->
-	<bean id="webscript.org.alfresco.rma.transferreport.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.TransferReportGet"
-		parent="rmBaseTransferWebscript">
-		<property name="dictionaryService" ref="DictionaryService" />
-		<property name="recordsManagementService" ref="RecordsManagementService" />
-		<property name="dispositionService" ref="DispositionService" />
-	</bean>
+   <!-- REST impl for GET transfer report -->
+   <bean id="webscript.org.alfresco.rma.transferreport.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.TransferReportGet"
+      parent="rmBaseTransferWebscript">
+      <property name="dictionaryService" ref="DictionaryService" />
+      <property name="recordsManagementService" ref="RecordsManagementService" />
+      <property name="dispositionService" ref="DispositionService" />
+   </bean>
 
-	<!-- REST impl for POST transfer report -->
-	<bean id="webscript.org.alfresco.rma.transferreport.post"
-		class="org.alfresco.module.org_alfresco_module_rm.script.TransferReportPost"
-		parent="rmBaseTransferWebscript">
-		<property name="dictionaryService" ref="DictionaryService" />
-		<property name="recordsManagementService" ref="RecordsManagementService" />
-		<property name="recordsManagementActionService" ref="RecordsManagementActionService" />
-		<property name="dispositionService" ref="DispositionService" />
-	</bean>
+   <!-- REST impl for POST transfer report -->
+   <bean id="webscript.org.alfresco.rma.transferreport.post"
+      class="org.alfresco.module.org_alfresco_module_rm.script.TransferReportPost"
+      parent="rmBaseTransferWebscript">
+      <property name="dictionaryService" ref="DictionaryService" />
+      <property name="recordsManagementService" ref="RecordsManagementService" />
+      <property name="recordsManagementActionService" ref="RecordsManagementActionService" />
+      <property name="dispositionService" ref="DispositionService" />
+   </bean>
 
-	<!-- RM Role API-->
+   <!-- RM Role API-->
 
-	<bean id="webscript.org.alfresco.rma.admin.rmrole.rmroles.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.admin.RmRolesGet"
-		parent="webscript">
-		<property name="recordsManagementService" ref="RecordsManagementService" />
-		<property name="recordsManagementSecurityService" ref="RecordsManagementSecurityService" />
-	</bean>
+   <bean id="webscript.org.alfresco.rma.admin.rmrole.rmroles.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.admin.RmRolesGet"
+      parent="webscript">
+      <property name="recordsManagementService" ref="RecordsManagementService" />
+      <property name="recordsManagementSecurityService" ref="RecordsManagementSecurityService" />
+   </bean>
 
-	<bean id="webscript.org.alfresco.rma.admin.rmrole.rmroles.post"
-		class="org.alfresco.module.org_alfresco_module_rm.script.admin.RmRolesPost"
-		parent="webscript">
-		<property name="recordsManagementService" ref="RecordsManagementService" />
-		<property name="recordsManagementSecurityService" ref="RecordsManagementSecurityService" />
-		<property name="capabilityService" ref="CapabilityService" />
-	</bean>
+   <bean id="webscript.org.alfresco.rma.admin.rmrole.rmroles.post"
+      class="org.alfresco.module.org_alfresco_module_rm.script.admin.RmRolesPost"
+      parent="webscript">
+      <property name="recordsManagementService" ref="RecordsManagementService" />
+      <property name="recordsManagementSecurityService" ref="RecordsManagementSecurityService" />
+      <property name="capabilityService" ref="CapabilityService" />
+   </bean>
 
-	<bean id="webscript.org.alfresco.rma.admin.rmrole.rmrole.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.admin.RmRoleGet"
-		parent="webscript">
-		<property name="recordsManagementService" ref="RecordsManagementService" />
-		<property name="recordsManagementSecurityService" ref="RecordsManagementSecurityService" />
-	</bean>
+   <bean id="webscript.org.alfresco.rma.admin.rmrole.rmrole.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.admin.RmRoleGet"
+      parent="webscript">
+      <property name="recordsManagementService" ref="RecordsManagementService" />
+      <property name="recordsManagementSecurityService" ref="RecordsManagementSecurityService" />
+   </bean>
 
-	<bean id="webscript.org.alfresco.rma.admin.rmrole.rmrole.put"
-		class="org.alfresco.module.org_alfresco_module_rm.script.admin.RmRolePut"
-		parent="webscript">
-		<property name="recordsManagementService" ref="RecordsManagementService" />
-		<property name="recordsManagementSecurityService" ref="RecordsManagementSecurityService" />
-		<property name="capabilityService" ref="CapabilityService" />
-	</bean>
+   <bean id="webscript.org.alfresco.rma.admin.rmrole.rmrole.put"
+      class="org.alfresco.module.org_alfresco_module_rm.script.admin.RmRolePut"
+      parent="webscript">
+      <property name="recordsManagementService" ref="RecordsManagementService" />
+      <property name="recordsManagementSecurityService" ref="RecordsManagementSecurityService" />
+      <property name="capabilityService" ref="CapabilityService" />
+   </bean>
 
-	<bean id="webscript.org.alfresco.rma.admin.rmrole.rmrole.delete"
-		class="org.alfresco.module.org_alfresco_module_rm.script.admin.RmRoleDelete"
-		parent="webscript">
-		<property name="recordsManagementService" ref="RecordsManagementService" />
-		<property name="recordsManagementSecurityService" ref="RecordsManagementSecurityService" />
-	</bean>
+   <bean id="webscript.org.alfresco.rma.admin.rmrole.rmrole.delete"
+      class="org.alfresco.module.org_alfresco_module_rm.script.admin.RmRoleDelete"
+      parent="webscript">
+      <property name="recordsManagementService" ref="RecordsManagementService" />
+      <property name="recordsManagementSecurityService" ref="RecordsManagementSecurityService" />
+   </bean>
 
-	<!--  Capability API -->
+   <!--  Capability API -->
 
-	<bean id="webscript.org.alfresco.rma.capability.capabilities.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.capability.CapabilitiesGet"
-		parent="webscript">
-		<property name="recordsManagementService" ref="RecordsManagementService" />
-		<property name="capabilityService" ref="CapabilityService" />
-	</bean>
+   <bean id="webscript.org.alfresco.rma.capability.capabilities.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.capability.CapabilitiesGet"
+      parent="webscript">
+      <property name="recordsManagementService" ref="RecordsManagementService" />
+      <property name="capabilityService" ref="CapabilityService" />
+   </bean>
 
-	<!-- RM Event API-->
+   <!-- RM Event API-->
 
-	<bean id="webscript.org.alfresco.rma.admin.rmevent.rmeventtypes.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.admin.RmEventTypesGet"
-		parent="webscript">
-		<property name="recordsManagementEventService" ref="RecordsManagementEventService" />
-	</bean>
+   <bean id="webscript.org.alfresco.rma.admin.rmevent.rmeventtypes.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.admin.RmEventTypesGet"
+      parent="webscript">
+      <property name="recordsManagementEventService" ref="RecordsManagementEventService" />
+   </bean>
 
-	<bean id="webscript.org.alfresco.rma.admin.rmevent.rmevents.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.admin.RmEventsGet"
-		parent="webscript">
-		<property name="recordsManagementEventService" ref="RecordsManagementEventService" />
-	</bean>
+   <bean id="webscript.org.alfresco.rma.admin.rmevent.rmevents.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.admin.RmEventsGet"
+      parent="webscript">
+      <property name="recordsManagementEventService" ref="RecordsManagementEventService" />
+   </bean>
 
-	<bean id="webscript.org.alfresco.rma.admin.rmevent.rmevents.post"
-		class="org.alfresco.module.org_alfresco_module_rm.script.admin.RmEventsPost"
-		parent="webscript">
-		<property name="recordsManagementEventService" ref="RecordsManagementEventService" />
-	</bean>
+   <bean id="webscript.org.alfresco.rma.admin.rmevent.rmevents.post"
+      class="org.alfresco.module.org_alfresco_module_rm.script.admin.RmEventsPost"
+      parent="webscript">
+      <property name="recordsManagementEventService" ref="RecordsManagementEventService" />
+   </bean>
 
-	<bean id="webscript.org.alfresco.rma.admin.rmevent.rmevent.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.admin.RmEventGet"
-		parent="webscript">
-		<property name="recordsManagementEventService" ref="RecordsManagementEventService" />
-	</bean>
+   <bean id="webscript.org.alfresco.rma.admin.rmevent.rmevent.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.admin.RmEventGet"
+      parent="webscript">
+      <property name="recordsManagementEventService" ref="RecordsManagementEventService" />
+   </bean>
 
-	<bean id="webscript.org.alfresco.rma.admin.rmevent.rmevent.put"
-		class="org.alfresco.module.org_alfresco_module_rm.script.admin.RmEventPut"
-		parent="webscript">
-		<property name="recordsManagementEventService" ref="RecordsManagementEventService" />
-	</bean>
+   <bean id="webscript.org.alfresco.rma.admin.rmevent.rmevent.put"
+      class="org.alfresco.module.org_alfresco_module_rm.script.admin.RmEventPut"
+      parent="webscript">
+      <property name="recordsManagementEventService" ref="RecordsManagementEventService" />
+   </bean>
 
-	<bean id="webscript.org.alfresco.rma.admin.rmevent.rmevent.delete"
-		class="org.alfresco.module.org_alfresco_module_rm.script.admin.RmEventDelete"
-		parent="webscript">
-		<property name="recordsManagementEventService" ref="RecordsManagementEventService" />
-	</bean>
+   <bean id="webscript.org.alfresco.rma.admin.rmevent.rmevent.delete"
+      class="org.alfresco.module.org_alfresco_module_rm.script.admin.RmEventDelete"
+      parent="webscript">
+      <property name="recordsManagementEventService" ref="RecordsManagementEventService" />
+   </bean>
 
-	<!-- REST impl for GET Email Map  -->
-	<bean id="webscript.org.alfresco.rma.admin.emailmap.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.EmailMapGet"
-		parent="webscript">
-		<property name="customEmailMappingService" ref="CustomEmailMappingService" />
-	</bean>
+   <!-- REST impl for GET Email Map  -->
+   <bean id="webscript.org.alfresco.rma.admin.emailmap.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.EmailMapGet"
+      parent="webscript">
+      <property name="customEmailMappingService" ref="CustomEmailMappingService" />
+   </bean>
 
-	<!-- REST impl for POST Email Map  -->
-	<bean id="webscript.org.alfresco.rma.admin.emailmap.post"
-		class="org.alfresco.module.org_alfresco_module_rm.script.EmailMapPost"
-		parent="webscript">
-		<property name="customEmailMappingService" ref="CustomEmailMappingService" />
-	</bean>
+   <!-- REST impl for POST Email Map  -->
+   <bean id="webscript.org.alfresco.rma.admin.emailmap.post"
+      class="org.alfresco.module.org_alfresco_module_rm.script.EmailMapPost"
+      parent="webscript">
+      <property name="customEmailMappingService" ref="CustomEmailMappingService" />
+   </bean>
 
-	<!-- REST impl for PUT Email Map  -->
-	<bean id="webscript.org.alfresco.rma.admin.emailmap.put"
-		class="org.alfresco.module.org_alfresco_module_rm.script.EmailMapPut"
-		parent="webscript">
-		<property name="customEmailMappingService" ref="CustomEmailMappingService" />
-	</bean>
+   <!-- REST impl for DELETE Email Map  -->
+   <bean id="webscript.org.alfresco.rma.admin.emailmap.delete"
+      class="org.alfresco.module.org_alfresco_module_rm.script.EmailMapDelete"
+      parent="webscript">
+      <property name="customEmailMappingService" ref="CustomEmailMappingService" />
+   </bean>
 
-	<!-- REST impl for GET RM Constraint  -->
-	<bean id="webscript.org.alfresco.rma.rmconstraints.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.RMConstraintGet"
-		parent="webscript">
-		<property name="caveatConfigService" ref="CaveatConfigService" />
-	</bean>
+   <!-- REST impl for GET RM Constraint  -->
+   <bean id="webscript.org.alfresco.rma.rmconstraints.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.RMConstraintGet"
+      parent="webscript">
+      <property name="caveatConfigService" ref="CaveatConfigService" />
+   </bean>
 
-	<!-- REST impl for GET User Rights Report -->
-	<bean id="webscript.org.alfresco.rma.userrightsreport.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.UserRightsReportGet"
-		parent="webscript">
-		<property name="authorityService" ref="AuthorityService" />
-		<property name="personService" ref="PersonService" />
-		<property name="nodeService" ref="NodeService" />
-		<property name="recordsManagementService" ref="RecordsManagementService" />
-		<property name="recordsManagementSecurityService" ref="RecordsManagementSecurityService" />
-	</bean>
+   <!-- REST impl for GET User Rights Report -->
+   <bean id="webscript.org.alfresco.rma.userrightsreport.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.UserRightsReportGet"
+      parent="webscript">
+      <property name="authorityService" ref="AuthorityService" />
+      <property name="personService" ref="PersonService" />
+      <property name="nodeService" ref="NodeService" />
+      <property name="recordsManagementService" ref="RecordsManagementService" />
+      <property name="recordsManagementSecurityService" ref="RecordsManagementSecurityService" />
+   </bean>
 
-	<!-- REST impl for GET Bootstrap Test Data -->
-	<bean id="webscript.org.alfresco.rma.bootstraptestdata.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.BootstrapTestDataGet"
-		parent="webscript">
-		<property name="nodeService" ref="NodeService" />
-		<property name="searchService" ref="SearchService" />
-		<property name="importerService" ref="ImporterService" />
-		<property name="permissionService" ref="PermissionService" />
-		<property name="siteService" ref="SiteService" />
-		<property name="recordsManagementService" ref="RecordsManagementService" />
-		<property name="recordsManagementActionService" ref="RecordsManagementActionService" />
-		<property name="authorityService" ref="AuthorityService" />
-		<property name="recordsManagementSecurityService" ref="RecordsManagementSecurityService" />
-		<property name="recordsManagementSearchBehaviour" ref="recordsManagementSearchBehaviour" />
-		<property name="dispositionService" ref="dispositionService" />
-	</bean>
+   <!-- REST impl for GET Bootstrap Test Data -->
+   <bean id="webscript.org.alfresco.rma.bootstraptestdata.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.BootstrapTestDataGet"
+      parent="webscript">
+      <property name="nodeService" ref="NodeService" />
+      <property name="searchService" ref="SearchService" />
+      <property name="importerService" ref="ImporterService" />
+      <property name="permissionService" ref="PermissionService" />
+      <property name="siteService" ref="SiteService" />
+      <property name="recordsManagementService" ref="RecordsManagementService" />
+      <property name="recordsManagementActionService" ref="RecordsManagementActionService" />
+      <property name="authorityService" ref="AuthorityService" />
+      <property name="recordsManagementSecurityService" ref="RecordsManagementSecurityService" />
+      <property name="recordsManagementSearchBehaviour" ref="recordsManagementSearchBehaviour" />
+      <property name="dispositionService" ref="dispositionService" />
+   </bean>
 
-	<!-- REST impl for GET applydodcertmodelfixes -->
-	<!--
-		This webscript is intended for patching the RM custom model during the
-		DoD certification process.
-	-->
-	<!-- TODO Delete this webscript after the certification process -->
-	<bean id="webscript.org.alfresco.rma.applydodcertmodelfixes.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.ApplyDodCertModelFixesGet"
-		parent="webscript">
-		<property name="contentService" ref="ContentService" />
-	</bean>
+   <!-- REST impl for GET applydodcertmodelfixes -->
+   <!--
+      This webscript is intended for patching the RM custom model during the
+      DoD certification process.
+   -->
+   <!-- TODO Delete this webscript after the certification process -->
+   <bean id="webscript.org.alfresco.rma.applydodcertmodelfixes.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.ApplyDodCertModelFixesGet"
+      parent="webscript">
+      <property name="contentService" ref="ContentService" />
+   </bean>
 
-	<!-- REST impl for GET applyfixmob1573 -->
-	<!-- TODO Delete this webscript after the certification process -->
-	<bean id="webscript.org.alfresco.rma.applyfixmob1573.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.ApplyFixMob1573Get"
-		parent="webscript">
-		<property name="contentService" ref="ContentService" />
-	</bean>
+   <!-- REST impl for GET applyfixmob1573 -->
+   <!-- TODO Delete this webscript after the certification process -->
+   <bean id="webscript.org.alfresco.rma.applyfixmob1573.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.ApplyFixMob1573Get"
+      parent="webscript">
+      <property name="contentService" ref="ContentService" />
+   </bean>
 
-	<!--  RM search web script -->
-	<bean id="webscript.org.alfresco.slingshot.rmsearch.rmsavedsearches.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.slingshot.RMSavedSearchesGet"
-		parent="webscript">
-		<property name="siteService" ref="SiteService" />
-		<property name="recordsManagementSearchService" ref="RecordsManagementSearchService" />
-	</bean>
+   <!--  RM search web script -->
+   <bean id="webscript.org.alfresco.slingshot.rmsearch.rmsavedsearches.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.slingshot.RMSavedSearchesGet"
+      parent="webscript">
+      <property name="siteService" ref="SiteService" />
+   <property name="recordsManagementSearchService" ref="RecordsManagementSearchService" />
+   </bean>
 
-	<bean id="webscript.org.alfresco.slingshot.rmsearch.rmsavedsearches.post"
-		class="org.alfresco.module.org_alfresco_module_rm.script.slingshot.RMSavedSearchesPost"
-		parent="webscript">
-		<property name="siteService" ref="SiteService" />
-		<property name="recordsManagementSearchService" ref="RecordsManagementSearchService" />
-		<property name="namespaceService" ref="namespaceService" />
-	</bean>
+   <bean id="webscript.org.alfresco.slingshot.rmsearch.rmsavedsearches.post"
+      class="org.alfresco.module.org_alfresco_module_rm.script.slingshot.RMSavedSearchesPost"
+      parent="webscript">
+      <property name="siteService" ref="SiteService" />
+      <property name="recordsManagementSearchService" ref="RecordsManagementSearchService" />
+      <property name="namespaceService" ref="namespaceService" />
+   </bean>
 
-	<bean
-		id="webscript.org.alfresco.slingshot.rmsearch.rmsavedsearches.delete"
-		class="org.alfresco.module.org_alfresco_module_rm.script.slingshot.RMSavedSearchesDelete"
-		parent="webscript">
-		<property name="siteService" ref="SiteService" />
-		<property name="recordsManagementSearchService" ref="RecordsManagementSearchService" />
-	</bean>
+   <bean
+      id="webscript.org.alfresco.slingshot.rmsearch.rmsavedsearches.delete"
+      class="org.alfresco.module.org_alfresco_module_rm.script.slingshot.RMSavedSearchesDelete"
+      parent="webscript">
+      <property name="siteService" ref="SiteService" />
+      <property name="recordsManagementSearchService" ref="RecordsManagementSearchService" />
+   </bean>
 
-	<bean id="webscript.org.alfresco.slingshot.rmsearch.rmsearch.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.slingshot.RMSearchGet"
-		parent="webscript">
-		<property name="siteService" ref="SiteService" />
-		<property name="recordsManagementSearchService" ref="RecordsManagementSearchService" />
-		<property name="namespaceService" ref="namespaceService" />
-		<property name="nodeService" ref="NodeService" />
-		<property name="dictionaryService" ref="DictionaryService" />
-		<property name="permissionService" ref="PermissionService" />
-		<property name="personService" ref="PersonService" />
-		<property name="contentService" ref="ContentService" />
-	</bean>
+   <bean id="webscript.org.alfresco.slingshot.rmsearch.rmsearch.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.slingshot.RMSearchGet"
+      parent="webscript">
+      <property name="siteService" ref="SiteService" />
+      <property name="recordsManagementSearchService" ref="RecordsManagementSearchService" />
+      <property name="namespaceService" ref="namespaceService" />
+      <property name="nodeService" ref="NodeService" />
+      <property name="dictionaryService" ref="DictionaryService" />
+      <property name="permissionService" ref="PermissionService" />
+      <property name="personService" ref="PersonService" />
+      <property name="contentService" ref="ContentService" />
+   </bean>
 
-	<bean
-		id="webscript.org.alfresco.slingshot.rmsearch.rmsearchproperties.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.slingshot.RMSearchPropertiesGet"
-		parent="webscript">
-		<property name="namespaceService" ref="namespaceService" />
-		<property name="dictionaryService" ref="DictionaryService" />
-		<property name="adminService" ref="RecordsManagementAdminService" />
-		<property name="recordService" ref="RecordService" />
-	</bean>
+   <bean
+      id="webscript.org.alfresco.slingshot.rmsearch.rmsearchproperties.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.slingshot.RMSearchPropertiesGet"
+      parent="webscript">
+      <property name="namespaceService" ref="namespaceService" />
+      <property name="dictionaryService" ref="DictionaryService" />
+      <property name="adminService" ref="RecordsManagementAdminService" />
+      <property name="recordService" ref="RecordService" />
+   </bean>
 
-	<bean id="webscript.org.alfresco.slingshot.forms.metadata.get"
-		class="org.alfresco.module.org_alfresco_module_rm.script.slingshot.forms.RMMetaDataGet"
-		parent="webscript">
-		<property name="recordsManagementService" ref="RecordsManagementService" />
-		<property name="namespaceService" ref="namespaceService" />
-		<property name="nodeService" ref="NodeService" />
-	</bean>
+   <bean id="webscript.org.alfresco.slingshot.forms.metadata.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.slingshot.forms.RMMetaDataGet"
+      parent="webscript">
+      <property name="recordsManagementService" ref="RecordsManagementService" />
+      <property name="namespaceService" ref="namespaceService" />
+      <property name="nodeService" ref="NodeService" />
+   </bean>
 
-    <!-- REST impl for GET Data Sets -->
-    <bean id="webscript.org.alfresco.rma.datasets.get" class="org.alfresco.module.org_alfresco_module_rm.script.DataSetsGet" parent="webscript">
-        <property name="dataSetService" ref="DataSetService" />
-        <property name="siteService" ref="SiteService" />
-    </bean>
-    
-    <!-- REST impl for POST Load Data Set -->
-    <bean id="webscript.org.alfresco.rma.dataset.post" class="org.alfresco.module.org_alfresco_module_rm.script.DataSetPost" parent="webscript">
-        <property name="dataSetService" ref="DataSetService" />
-        <property name="siteService" ref="SiteService" />
-    </bean>
-    
+   <!-- REST impl for GET Data Sets -->
+   <bean id="webscript.org.alfresco.rma.datasets.get"
+      class="org.alfresco.module.org_alfresco_module_rm.script.DataSetsGet"
+      parent="webscript">
+      <property name="dataSetService" ref="DataSetService" />
+      <property name="siteService" ref="SiteService" />
+   </bean>
+
+   <!-- REST impl for POST Load Data Set -->
+   <bean id="webscript.org.alfresco.rma.dataset.post"
+      class="org.alfresco.module.org_alfresco_module_rm.script.DataSetPost"
+      parent="webscript">
+      <property name="dataSetService" ref="DataSetService" />
+      <property name="siteService" ref="SiteService" />
+   </bean>
 </beans>
\ No newline at end of file
diff --git a/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.delete.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.delete.desc.xml
new file mode 100644
index 0000000000..40af72f2cb
--- /dev/null
+++ b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.delete.desc.xml
@@ -0,0 +1,15 @@
+<webscript>
+   <shortname>Delete email property map</shortname>
+   <description><![CDATA[
+      Delete the custom email property map
+      <br />
+      DELETE /api/rma/admin/emailmap/{from}/{to} deletes the specified mapping
+      Returns data in the same format as the get method
+   ]]>
+   </description>
+   <url>/api/rma/admin/emailmap/{from}/{to}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction>required</transaction>
+   <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.put.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.delete.json.ftl
similarity index 59%
rename from rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.put.json.ftl
rename to rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.delete.json.ftl
index 99d37fbb76..d798509bc0 100644
--- a/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.put.json.ftl
+++ b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.delete.json.ftl
@@ -2,7 +2,6 @@
 
 <#escape x as jsonUtils.encodeJSONString(x)>
 {
-	"data":
-	<@emailmapLib.emailmapJSON emailmap=emailmap />       
+   "data": <@emailmapLib.emailmapJSON emailmap=emailmap />
 }
 </#escape>
\ No newline at end of file
diff --git a/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.get.json.ftl
index f38906ee62..d798509bc0 100644
--- a/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.get.json.ftl
+++ b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.get.json.ftl
@@ -2,7 +2,6 @@
 
 <#escape x as jsonUtils.encodeJSONString(x)>
 {
-	"data":
-	<@emailmapLib.emailmapJSON emailmap=emailmap />        
+   "data": <@emailmapLib.emailmapJSON emailmap=emailmap />
 }
 </#escape>
\ No newline at end of file
diff --git a/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.lib.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.lib.ftl
index d4a297276e..e857188b9c 100644
--- a/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.lib.ftl
+++ b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.lib.ftl
@@ -2,13 +2,13 @@
 
 <#macro emailmapJSON emailmap>
 <#escape x as jsonUtils.encodeJSONString(x)>
-	{
-		"mappings":
-		[
-			<#list emailmap as mapping> 
-			{"from": "${mapping.from}", "to": "${mapping.to}" }<#if mapping_has_next>,</#if>
-			</#list>
-		]
-	}
+   {
+      "mappings":
+      [
+         <#list emailmap as mapping> 
+         {"from": "${mapping.from}", "to": "${mapping.to}" }<#if mapping_has_next>,</#if>
+         </#list>
+      ]
+   }
 </#escape>
 </#macro>
\ No newline at end of file
diff --git a/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.post.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.post.json.ftl
index 68bf020fe0..559ac91406 100644
--- a/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.post.json.ftl
+++ b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.post.json.ftl
@@ -2,6 +2,11 @@
 
 <#escape x as jsonUtils.encodeJSONString(x)>
 {
-	"data": <@emailmapLib.emailmapJSON emailmap=emailmap />       
+   "success": ${success?string},
+   <#if success>
+      "data": <@emailmapLib.emailmapJSON emailmap=emailmap />
+   <#else>
+      "message": "${message}"
+   </#if>
 }
 </#escape>
\ No newline at end of file
diff --git a/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.put.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.put.desc.xml
deleted file mode 100644
index eec6580c60..0000000000
--- a/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.put.desc.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<webscript>
-  <shortname>Update email property map</shortname>
-  <description><![CDATA[
-  Update the custom email property map
-  <br />
-  Data is specified in JSON format as a JSONObject with two optional fields, "add" and "delete".
-  <br />
-  The contents of the add array are added.
-  <br />
-  The contents of the delete array are deleted.
-  <br />
-  Add mapping:
-  <pre>
-   {
-      "add":
-      [
-         {"to":"rmc:Wibble", "from":"whatever"},
-         {"to":"rmc:wobble", "from":"whatever"}
-      ]
-   }
-  </pre>
-  Delete mapping:
-  <pre>
-   {
-      "delete":
-      [
-         {"to":"rmc:Wibble", "from":"whatever"},
-         {"to":"rmc:wobble", "from":"whatever"}
-      ]
-   }
-  </pre>
-  Returns data in the same format as the get method
-  ]]>
-  </description>
-  <url>/api/rma/admin/emailmap</url>
-  <format default="json">argument</format>
-  <authentication>user</authentication>
-  <transaction>required</transaction>
-  <lifecycle>internal</lifecycle>
-</webscript>
\ No newline at end of file
diff --git a/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsearchproperties.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsearchproperties.get.json.ftl
index e5fe1b268d..0341c3843b 100644
--- a/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsearchproperties.get.json.ftl
+++ b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsearchproperties.get.json.ftl
@@ -1,27 +1,27 @@
 <#escape x as jsonUtils.encodeJSONString(x)>
 {
-	"data" : 
-	{
-		"groups" :
-		[
-			<#list groups as group>
-			{
-				"id" : "${group.id}",
-				"label" : "${group.label}",
-				"properties" : 
-				[
-				   <#list group.properties as property>
-				   {
-				      "prefix" : "${property.prefix}",
-				      "name" : "${property.shortName}",
-				      "label" : "${property.label}",
-				      "type" : "${property.type}"
-				   }<#if property_has_next>,</#if>
-				   </#list>
-				]
-			}<#if group_has_next>,</#if>
-			</#list>
-		]
-	}	
+   "data" :
+   {
+      "groups" :
+      [
+         <#list groups as group>
+         {
+            "id" : "${group.id}",
+            "label" : "${group.label}",
+            "properties" : 
+            [
+               <#list group.properties as property>
+               {
+                  "prefix" : "${property.prefix}",
+                  "name" : "${property.shortName}",
+                  "label" : "${property.label}",
+                  "type" : "${property.type}"
+               }<#if property_has_next>,</#if>
+               </#list>
+            ]
+         }<#if group_has_next>,</#if>
+         </#list>
+      ]
+   }
 }
 </#escape>
\ No newline at end of file
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapPut.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapDelete.java
similarity index 53%
rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapPut.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapDelete.java
index f49a8bfa9b..c51778d372 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapPut.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapDelete.java
@@ -18,17 +18,12 @@
  */
 package org.alfresco.module.org_alfresco_module_rm.script;
 
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 
 import org.alfresco.module.org_alfresco_module_rm.email.CustomEmailMappingService;
-import org.alfresco.module.org_alfresco_module_rm.email.CustomMapping;
-import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.json.JSONTokener;
 import org.springframework.extensions.webscripts.Cache;
 import org.springframework.extensions.webscripts.DeclarativeWebScript;
 import org.springframework.extensions.webscripts.Status;
@@ -39,70 +34,45 @@ import org.springframework.extensions.webscripts.WebScriptRequest;
  * Implementation for Java backed webscript to return 
  * custom email field mappings
  */
-public class EmailMapPut extends DeclarativeWebScript
-{   
-     /*
-     * @see org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.Status, org.alfresco.web.scripts.Cache)
-     */
-    @Override
-    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
-    {
-
-        try
-        {
-            JSONObject json = null;
-            json = new JSONObject(new JSONTokener(req.getContent().getContent()));
-            
-            if(json.has("add"))
-            {
-                JSONArray toAdd = json.getJSONArray("add");
-                for(int i = 0 ; i < toAdd.length(); i++)
-                {
-                    JSONObject val = toAdd.getJSONObject(i);
-                    customEmailMappingService.addCustomMapping(val.getString("from"), val.getString("to"));
-                    
-                }
-            }
-            
-            if(json.has("delete"))
-            {
-                JSONArray toDelete = json.getJSONArray("delete");
-                for(int i = 0 ; i < toDelete.length(); i++)
-                {
-                    JSONObject val = toDelete.getJSONObject(i);
-                    customEmailMappingService.deleteCustomMapping(val.getString("from"), val.getString("to"));
-                }
-            }
-            
-                
-            // Set the return value.
-            Set<CustomMapping> emailMap = customEmailMappingService.getCustomMappings();
-            // create model object with the lists model
-            Map<String, Object> model = new HashMap<String, Object>(1);
-            model.put("emailmap", emailMap);
-            return model;
-        }
-        catch (IOException iox)
-        {
-            throw new WebScriptException(Status.STATUS_BAD_REQUEST,
-                    "Could not read content from req.", iox);
-        }
-        catch (JSONException je)
-        {
-            throw new WebScriptException(Status.STATUS_BAD_REQUEST,
-                        "Could not parse JSON from req.", je);
-        }
-    }
-    
+public class EmailMapDelete extends DeclarativeWebScript
+{
+    /** Custom email mapping service */
     private CustomEmailMappingService customEmailMappingService;
 
+    /**
+     * Custom email mapping service
+     * 
+     * @param customEmailMappingService the custom email mapping service
+     */
     public void setCustomEmailMappingService(CustomEmailMappingService customEmailMappingService)
     {
         this.customEmailMappingService = customEmailMappingService;
     }
 
-    public CustomEmailMappingService getCustomEmailMappingService()
+    /**
+     * @see org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.Status, org.alfresco.web.scripts.Cache)
+     */
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
     {
-        return customEmailMappingService;
+        try
+        {
+            // Get the data from the request
+            JSONObject json = new JSONObject(req.getServiceMatch().getTemplateVars());
+
+            // Delete custom mapping 
+            customEmailMappingService.deleteCustomMapping(json.getString("from"), json.getString("to"));
+
+            // Create model object with the lists of custom mappings
+            Map<String, Object> model = new HashMap<String, Object>(1);
+            model.put("emailmap", customEmailMappingService.getCustomMappings());
+
+            return model;
+        }
+        catch (JSONException je)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST,
+                    "Could not parse JSON from req.", je);
+        }
     }
 }
\ No newline at end of file
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapGet.java
index 7f225e5cac..257dc4e4dc 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapGet.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapGet.java
@@ -20,48 +20,41 @@ package org.alfresco.module.org_alfresco_module_rm.script;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 
 import org.alfresco.module.org_alfresco_module_rm.email.CustomEmailMappingService;
-import org.alfresco.module.org_alfresco_module_rm.email.CustomMapping;
 import org.springframework.extensions.webscripts.Cache;
 import org.springframework.extensions.webscripts.DeclarativeWebScript;
 import org.springframework.extensions.webscripts.Status;
 import org.springframework.extensions.webscripts.WebScriptRequest;
 
 /**
- * Implementation for Java backed webscript to return 
+ * Implementation for Java backed webscript to return
  * custom email field mappings
  */
 public class EmailMapGet extends DeclarativeWebScript
-{   
-    
-    /*
-     * @see org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.Status, org.alfresco.web.scripts.Cache)
-     */
-    @Override
-    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
-    {     
-        // String requestUrl = req.getURL();
-        
-        Set<CustomMapping> emailMap = customEmailMappingService.getCustomMappings();
-        
-        // create model object with the lists model
-        Map<String, Object> model = new HashMap<String, Object>(1);
-        model.put("emailmap", emailMap);
-        return model;
-    }
-    
+{
+    /** Custom email mapping service */
     private CustomEmailMappingService customEmailMappingService;
 
+    /**
+     * Custom email mapping service
+     * 
+     * @param customEmailMappingService the custom email mapping service
+     */
     public void setCustomEmailMappingService(CustomEmailMappingService customEmailMappingService)
     {
         this.customEmailMappingService = customEmailMappingService;
     }
 
-    public CustomEmailMappingService getCustomEmailMappingService()
+    /**
+     * @see org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.Status, org.alfresco.web.scripts.Cache)
+     */
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
     {
-        return customEmailMappingService;
+        // Create model object with the lists of custom mappings
+        Map<String, Object> model = new HashMap<String, Object>(1);
+        model.put("emailmap", customEmailMappingService.getCustomMappings());
+        return model;
     }
-    
 }
\ No newline at end of file
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapPost.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapPost.java
index 369f069218..4461c0b57c 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapPost.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapPost.java
@@ -21,11 +21,9 @@ package org.alfresco.module.org_alfresco_module_rm.script;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 
+import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.module.org_alfresco_module_rm.email.CustomEmailMappingService;
-import org.alfresco.module.org_alfresco_module_rm.email.CustomMapping;
-import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONTokener;
@@ -40,46 +38,38 @@ import org.springframework.extensions.webscripts.WebScriptRequest;
  * custom email field mappings
  */
 public class EmailMapPost extends DeclarativeWebScript
-{   
-     /*
+{
+    /** Custom email mapping service */
+    private CustomEmailMappingService customEmailMappingService;
+
+    /**
+     * Custom email mapping service
+     * 
+     * @param customEmailMappingService the custom email mapping service
+     */
+    public void setCustomEmailMappingService(CustomEmailMappingService customEmailMappingService)
+    {
+        this.customEmailMappingService = customEmailMappingService;
+    }
+
+    /**
      * @see org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.Status, org.alfresco.web.scripts.Cache)
      */
     @Override
     protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
     {
-
+        Map<String, Object> model = new HashMap<String, Object>(1);
         try
         {
-            JSONObject json = null;
-            json = new JSONObject(new JSONTokener(req.getContent().getContent()));
-            
-            if(json.has("delete"))
-            {
-                JSONArray toDelete = json.getJSONArray("delete");
-                for(int i = 0 ; i < toDelete.length(); i++)
-                {
-                    JSONObject val = toDelete.getJSONObject(i);
-                    customEmailMappingService.deleteCustomMapping(val.getString("from"), val.getString("to"));
-                }
-            }
-            
-            if(json.has("add"))
-            {
-                JSONArray toAdd = json.getJSONArray("add");
-                for(int i = 0 ; i < toAdd.length(); i++)
-                {
-                    JSONObject val = toAdd.getJSONObject(i);
-                    customEmailMappingService.addCustomMapping(val.getString("from"), val.getString("to"));
-                    
-                }
-            }
-            
-            // Set the return value.
-            Set<CustomMapping> emailMap = customEmailMappingService.getCustomMappings();
-            // create model object with the lists model
-            Map<String, Object> model = new HashMap<String, Object>(1);
-            model.put("emailmap", emailMap);
-            return model;
+            // Get the data from the content
+            JSONObject json = new JSONObject(new JSONTokener(req.getContent().getContent()));
+
+            // Add custom mapping 
+            customEmailMappingService.addCustomMapping(json.getString("from"), json.getString("to"));
+
+            // Add the lists of custom mappings to the model
+            model.put("emailmap", customEmailMappingService.getCustomMappings());
+            model.put("success", true);
         }
         catch (IOException iox)
         {
@@ -89,21 +79,14 @@ public class EmailMapPost extends DeclarativeWebScript
         catch (JSONException je)
         {
             throw new WebScriptException(Status.STATUS_BAD_REQUEST,
-                        "Could not parse JSON from req.", je);
+                    "Could not parse JSON from req.", je);
+        }
+        catch (AlfrescoRuntimeException are)
+        {
+            model.put("message", are.getMessage());
+            model.put("success", false);
         }
-    }
-    
-    private CustomEmailMappingService customEmailMappingService;
 
-    public void setCustomEmailMappingService(CustomEmailMappingService customEmailMappingService)
-    {
-        this.customEmailMappingService = customEmailMappingService;
+        return model;
     }
-
-    public CustomEmailMappingService getCustomEmailMappingService()
-    {
-        return customEmailMappingService;
-    }
-    
-    
 }
\ No newline at end of file