Allow editing of container xblocks/xmodules

STUD-1312
Merge pull request #3819 from edx/andya/edit-containers

Allow editing of container xblocks/xmodules