Make XmlModuleStore handle asides
PLAT-221

Conflicts:
	cms/lib/xblock/runtime.py
	common/lib/xmodule/xmodule/x_module.py