Merge pull request #12336 from edx/douglashall/fix_release_rebase

Fix rc/2016-05-03 rebase with release branch

openedx/core/lib/courses.py

@@ -14,7 +14,7 @@ def course_image_url(course, image_key='course_image'):
     """Try to look up the image url for the course.  If it's not found,
     log an error and return the dead link.
     image_key can be one of the three: 'course_image', 'hero_image', 'thumbnail_image' """
-    if course.static_asset_path or modulestore().get_modulestore_type(course.id) == ModuleStoreEnum.Type.xml:
+    if course.static_asset_path:
         # If we are a static course with the image_key attribute
         # set different than the default, return that path so that
         # courses can use custom course image paths, otherwise just