Merge hotfixes down into unstable

[bjester]

Summary

Merge conflicts:

diff --cc contentcuration/contentcuration/tests/helpers.py
index eeddd11c5,cf1d54130..000000000
--- a/contentcuration/contentcuration/tests/helpers.py
+++ b/contentcuration/contentcuration/tests/helpers.py
@@@ -2,8 -2,9 +2,13 @@@ from builtins import st
  from importlib import import_module
  
  import mock
++<<<<<<< HEAD
 +from celery import states
++=======
+ from search.models import ContentNodeFullTextSearch
++>>>>>>> unstable
  
+ from contentcuration.models import ContentNode
  from contentcuration.models import TaskResult