Merge pull request #8715 from edx/resolve-merge-conflicts

Resolve merge conflicts

cms/djangoapps/contentstore/tests/test_utils.py

@@ -154,7 +154,7 @@ class XBlockVisibilityTestCase(ModuleStoreTestCase):
         super(XBlockVisibilityTestCase, self).setUp()
 
         self.dummy_user = ModuleStoreEnum.UserID.test
-        self.past = datetime(1970, 1, 1)
+        self.past = datetime(1970, 1, 1, tzinfo=UTC)
         self.future = datetime.now(UTC) + timedelta(days=1)
         self.course = CourseFactory.create()