Conflict in import because someone had added an import in master that
was not in the release.

Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_xml_importer.py