Merge pull request #16860 from edx/bmedx/django111_fix_cms_errors

Changes to fix various Django 1.11 errors

cms/envs/common.py

@@ -1135,6 +1135,9 @@ INSTALLED_APPS = [
     # DRF filters
     'django_filters',
     'cms.djangoapps.api',
+
+    # Entitlements, used in openedx tests
+    'entitlements',
 ]
 
 

openedx/tests/settings.py

@@ -23,6 +23,7 @@ INSTALLED_APPS = (
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'openedx.core.djangoapps.video_config',
+    'openedx.core.djangoapps.video_pipeline',
     'edxval',
 )