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

Conflicts:
	common/lib/xmodule/xmodule/modulestore/locations.py
Merge pull request #3651 from edx/opaque-keys-xmodule-lib-cleanup

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