ALF-9510 checkin. Also some fixes for ALF-8702.

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

source/java/org/alfresco/encryption/EncryptorTest.java

@@ -85,15 +85,15 @@ public class EncryptorTest extends TestCase
         Serializable testObject = "   This is a string, but will be serialized    ";
 
         Serializable sealedObject = encryptor.sealObject("mykey2", null, testObject);
-        try
-        {
+//        try
+//        {
         	Object output = encryptor.unsealObject("mykey2", sealedObject);
             assertEquals("Encryption round trip failed. ", testObject, output);
-        }
-        catch(KeyException e)
-        {
-        	throw new AlfrescoRuntimeException("", e)
-;        }
+//        }
+//        catch(KeyException e)
+//        {
+//        	throw new AlfrescoRuntimeException("", e)
+//;        }
 
     }
 }