Cherry-picked into rc by Joe Blaylock <jrbl@stanford.edu>.

Conflicts:
	cms/djangoapps/contentstore/views/component.py