Resolve merge conflicts relative to master

cms/djangoapps/contentstore/views/item.py

cms/djangoapps/contentstore/views/tests/test_container.py

cms/djangoapps/contentstore/views/tests/test_tabs.py

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

...oapps/certificates/management/commands/gen_cert_report.py

lms/djangoapps/certificates/queue.py

lms/djangoapps/certificates/views.py

lms/djangoapps/courseware/module_render.py

lms/djangoapps/courseware/tests/test_module_render.py

lms/djangoapps/instructor/views/api.py

lms/djangoapps/instructor/views/instructor_dashboard.py

lms/djangoapps/instructor/views/legacy.py

lms/djangoapps/shoppingcart/tests/test_models.py

lms/djangoapps/verify_student/views.py