Fix bug where content_type is not set. We need to check if an uploaded file's mime type is mapped to image. Later the code uses the passed in other_type or image_type parameter to set the actual content type of the item created. The code only checks for image or not image, so we don't need to find out every type mapped to the upload file's mime type.
Fix cr_import_content. Removed additional call to cr_registered_type_for_mime_type used inappropirately. Restored query removed in error on last commit.