Index: kernel-impl/src/main/java/org/sakaiproject/content/impl/BaseContentService.java
===================================================================
--- kernel-impl/src/main/java/org/sakaiproject/content/impl/BaseContentService.java	(revision 306386)
+++ kernel-impl/src/main/java/org/sakaiproject/content/impl/BaseContentService.java	(working copy)
@@ -158,7 +158,6 @@
 import org.sakaiproject.user.api.UserDirectoryService;
 import org.sakaiproject.user.api.UserNotDefinedException;
 import org.sakaiproject.util.BaseResourcePropertiesEdit;
-import org.sakaiproject.util.Blob;
 import org.sakaiproject.util.DefaultEntityHandler;
 import org.sakaiproject.util.Resource;
 import org.sakaiproject.util.ResourceLoader;
@@ -8808,11 +8807,12 @@
 	 * @exception ServerOverloadException
 	 *            if the server is configured to write the resource body to the filesystem and the save fails.
 	 * @return a new ContentResource object, or null if it was not created.
+	 * @deprecated Use {@link #mergeResource(Element, InputStream)}. (KNL-898)
 	 */
 	protected ContentResource mergeResource(Element element) throws PermissionException, InconsistentException, IdInvalidException,
 	OverQuotaException, ServerOverloadException
 	{
-		return mergeResource(element, null);
+		return mergeResource(element, (InputStream) null);
 
 	} // mergeResource
 
@@ -8821,7 +8821,7 @@
 	 * 
 	 * @param element
 	 *        The XML DOM element containing the collection definition.
-	 * @param body
+	 * @param in
 	 *        The body bytes.
 	 * @exception PermissionException
 	 *            if the user does not have permission to add a resource.
Index: kernel-storage-util/src/main/java/org/sakaiproject/util/Blob.java
===================================================================
--- kernel-storage-util/src/main/java/org/sakaiproject/util/Blob.java	(revision 306386)
+++ kernel-storage-util/src/main/java/org/sakaiproject/util/Blob.java	(working copy)
@@ -48,6 +48,7 @@
 * Long.MAX_VALUE (9.2233e18) bytes if your computer had that much storage.  :^)
 * <P>This is my 'pet' class.
 * @author T. Gee
+* @deprecated (KNL-898)
 *
 */
 public class Blob implements Cloneable, Serializable {