Responses to comments on https://github.com/edx/edx-platform/pull/3539
Responses to comments on https://github.com/edx/edx-platform/pull/3539

Conflicts:
	common/lib/xmodule/xmodule/modulestore/locations.py

bmedx/modulestore,bmedx/modulestore,bmedx/modulestore