add initial_state attribute to jsinput tag
Log CDN request timeout with level INFO.
Use data dir from course.
Remove import.
Updating SciPy
Updating acceptance (lettuce) db cache
Simplify bok choy environments to inherit pipeline settings from common.py
Revert "Merge pull request #4545 from edx/renzo/bi-analytics-overhaul"

This reverts commit 252038c37664f90d5967f93454a6f23a0938258e, reversing
changes made to 7caf8c53b1a32ded0da4a50429f397efb7ba1ffc.
Fix incorrect max upload file size on forums

The file size is calculated and displayed as a number of bytes, but was
being incorrectly labeled as 'K' [0].

The size is now correctly labeled as "bytes" and the sentence now begins
with a leading captial letter.

Impact: This has been broken on master since 2012 [1].

[0] https://github.com/edx/edx-platform/blob/master/lms/djangoapps/django_comment_client/settings.py#L4
[1] https://github.com/edx/edx-platform/commit/5d90366917c6e81513e26ea4cb8305df0f3e6d97
Merge pull request #4382 from edx/oleg/cdn-log-level-fix

Log CDN request timeout with level INFO.
Show category when an xblock does not have a default display name
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.