Merged V2.1 to HEAD

6418: Allow getLayeringInfo on deleted nodes.
   6419: fixes for submitting of deleted directories and regenerate renditions related fixes.
   6420: Added installs to build
   6421: Build fix for sdk
   6423: WCM-710 - Submit All feature reintroducted to WCM My Modified Files views
   6424: OpenOffice connection is now tested on bootstrap.
   6425: AWC-1446 - Space Selector would show spaces you do not have access to
   6426: WCM-699 - Staging area user assets
   6427: Rollback exceptions now explicitly handled by RetryingTransactionHelper to extract the cause of the exception.
   6428: Fix for AWC-1340
   6429: Fixed transaction boundaries for full index recovery components
   6433: AR-1660 - SMB and SMB2 signature check 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6732 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/bootstrap-context.xml

@@ -409,6 +409,15 @@
        
 	<!-- Startup Message -->
 
+    <bean id="openOfficeConnectionTester" class="org.alfresco.util.OpenOfficeConnectionTester" >
+        <property name="connection">
+            <ref bean="openOfficeConnection" />
+        </property>
+        <property name="strict">
+            <value>false</value>
+        </property>
+    </bean>
+
     <bean id="startupLog" class="org.alfresco.repo.descriptor.DescriptorStartupLog">
        <property name="descriptorService">
 	       	<ref local="descriptorComponent"/>

config/alfresco/content-services-context.xml

@@ -121,14 +121,6 @@
    </bean>
    
    <bean id="openOfficeConnection" class="net.sf.jooreports.openoffice.connection.SocketOpenOfficeConnection" />
-   <bean id="openOfficeConnectionTester" class="org.alfresco.util.OpenOfficeConnectionTester" init-method="checkConnection" >
-      <property name="connection">
-         <ref bean="openOfficeConnection" />
-      </property>
-      <property name="strict">
-         <value>false</value>
-      </property>
-   </bean>
    
    <!-- Metadata Extraction Regisitry -->
    <bean id="metadataExtracterRegistry" class="org.alfresco.repo.content.metadata.MetadataExtracterRegistry" />

config/alfresco/public-services-context.xml

@@ -1365,9 +1365,6 @@
         </property>
     </bean>
 
-
-
-
     <!-- LinkValidationService -->
     <!-- Read transaction advisor for link validation service. -->
     <bean id="linkValidationServiceReadTxnAdvisor" 
@@ -1387,7 +1384,7 @@
         </property>
     </bean>
 
- <!-- Write transaction advisor for link validation service. -->
+    <!-- Write transaction advisor for link validation service. -->
     <bean id="linkValidationServiceWriteTxnAdvisor" 
           class="org.springframework.aop.support.NameMatchMethodPointcutAdvisor">
         <property name="advice">