Tidy up after merge from 5.1.N to HEAD

- This batch are to do with Mark's commits and reverts
     The 5.1.N 119393 record only merge should have had some changes from HEAD 118791

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123732 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/test-java/org/alfresco/util/schemacomp/SchemaReferenceFileTest.java

@@ -64,7 +64,10 @@ public class SchemaReferenceFileTest
     @After
     public void tearDown()
     {
-        ctx.close();
+        if(ctx != null)
+        {
+            ctx.close();
+        }
     }
 
     @Test