Explicitly re-save XBlock fields during import
Merge pull request #3225 from edx/will/studio-import-xblock-fixes

Explicitly re-save XBlock fields during import