Merge pull request #1933 from edx/diana/drupal/fix-cms-tests

Drupal: Add cookie name to the cms settings so we don't error out while looking for it

cms/envs/common.py

@@ -264,3 +264,7 @@ INSTALLED_APPS = (
     'staticfiles',
     'static_replace',
 )
+
+################# EDX MARKETING SITE ##################################
+
+EDXMKTG_COOKIE_NAME = 'edxloggedin'