Merge pull request #2880 from edx/cale/fix-crazy-items-error

cms/djangoapps/contentstore/views/component.py

cms/envs/bok_choy.py

cms/envs/common.py

cms/envs/test.py

common/lib/xmodule/xmodule/html_module.py

common/lib/xmodule/xmodule/modulestore/mongo/base.py

common/lib/xmodule/xmodule/modulestore/split_mongo/split.py

common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py

lms/envs/bok_choy.py

lms/envs/common.py