Release and merge conflict resolution

merging in the release branch, plus resolving merge conflicts
see https://github.com/edx/edx-platform/pull/2758