add initial_state attribute to jsinput tag
Log CDN request timeout with level INFO.
Updating acceptance (lettuce) db cache
Simplify bok choy environments to inherit pipeline settings from common.py
LMS-11137 Course Action State Django models.
clone_course: Add fields parameter to support new display_name.
LMS-11016 Studio server-side for course_listing and course_rerun.

Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
Fixup: Studio server-side - review comments.
Merge pull request #4574 from edx/reruns/cms-server-side

Reruns/cms server side LMS-11016
Merge pull request #4382 from edx/oleg/cdn-log-level-fix

Log CDN request timeout with level INFO.
Merge pull request #4292 from terman/jsinput

Supply initial_state attribute for jsinput tag
Merge pull request #4595 from edx/mvo/update_acceptance_db_caches

Updating acceptance (lettuce) db cache
enable sharding of bok-choy tests
add shard_1 flags to cms bok-choy tests
use paver commands in jenkins script
updated doctring to explain the bok-choy shards
adding discussion tests to shard_1
Merge pull request #4593 from edx/clytwynec/shard_out_bokchoy_tests

Clytwynec/shard out bokchoy tests
Merge pull request #4597 from edx/benp/fix-bok-choy-solano

Simplify bok choy environments to inherit pipeline settings from common.
Fix false positive test in cms acceptance

This test was passing in Jenkins, but failing in our Solano runs (and locally on firefox).
This is because it was attaching a file that was not there. This change fixes the test
and makes the attachment method smarter so it will fail if it tries attaching a non-existent
file.