Merge from SEAMIST3

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

source/java/org/alfresco/repo/web/scripts/RepositoryContainer.java

@@ -180,7 +180,6 @@ public class RepositoryContainer extends AbstractRuntimeContainer implements Ten
         Map<String, Object> params = new HashMap<String, Object>();
         params.putAll(super.getTemplateParameters());
         params.put(TemplateService.KEY_IMAGE_RESOLVER, imageResolver.getImageResolver());
-        params.put("cropContent", new CropContentMethod());
         addRepoParameters(params);
         return params;
     }

source/java/org/alfresco/repo/web/scripts/TestWebScriptRepoServer.java

@@ -156,5 +156,5 @@ public class TestWebScriptRepoServer extends TestWebScriptServer
             }
         }, username);
     }
-            
+
 }