E0d/fix conflicts

[e0d]

@adampalay @jarv @dmitchell @wedaly @jzoldak

This branch resolved merge conflict between master and release. Can you please review. The tests failed, but they've been failing for a bit today, so I'm not sure if this is related

We can't have a new rc until we get to the bottom of these conflicts.

[e0d]

Conflicts that were resolved favoring head in both cases.

diff --cc cms/templates/js/transcripts/messages/transcripts-uploaded.underscore
index 9895d7f,c17d83f..0000000
--- a/cms/templates/js/transcripts/messages/transcripts-uploaded.underscore
+++ b/cms/templates/js/transcripts/messages/transcripts-uploaded.underscore
@@@ -10,7 -10,7 +10,11 @@@
      <button class="action setting-upload" type="button" name="setting-upload" 
          <span><%= gettext("Upload New Timed Transcript") %></span>
      </button>
++<<<<<<< HEAD
 +    <a class="action setting-download" href="/transcripts/download?locator=<%=
++=======
+     <a class="action setting-download" href="/transcripts/download?locator=<%=
++>>>>>>> origin/release
          <span><%= gettext("Download to Edit") %></span>
      </a>
  </div>

diff --cc cms/djangoapps/auth/authz.py
index a5d00e1,5ec7beb..0000000
--- a/cms/djangoapps/auth/authz.py
+++ b/cms/djangoapps/auth/authz.py
@@@ -265,8 -262,8 +262,13 @@@ def is_user_in_creator_group(user)
          return False

      # Feature flag for using the creator group setting. Will be removed once t
++<<<<<<< HEAD
 +    if settings.FEATURES.get('ENABLE_CREATOR_GROUP', False):
 +        return user.groups.filter(name=COURSE_CREATOR_GROUP_NAME).count() > 0
++=======
+     if settings.MITX_FEATURES.get('ENABLE_CREATOR_GROUP', False):
+         return user.groups.filter(name=COURSE_CREATOR_GROUP_NAME).exists()
++>>>>>>> origin/release

      return True

[wedaly]

The tests are failing because collectstatic broke with this PR: https://github.com/edx/edx-platform/pull/1889
I'm not sure the best way to back out those changes.

[dmitchell]

For authz, it should be

if settings.FEATURES.get('ENABLE_CREATOR_GROUP', False):
    return user.groups.filter(name=COURSE_CREATOR_GROUP_NAME).exists()

That is, one line from HEAD and one from branch. I don't know if it makes much of a difference (a slightly faster sql query for exists than count).

I'm not really sure about transcripts-uploaded.underscore but believe HEAD is the safer bet (the snippet above doesn't show the conflict but I recall resolving it locally as well that way).