rebase-studio-fix: Fix editing in Studio after changes from release
Merge pull request #2 from edx-solutions/rebase-studio-fix

rebase-studio-fix: Fix editing in Studio after changes from release