edX's 2014-08-14 hotfix release pt 2 Conflicts: AUTHORS cms/djangoapps/contentstore/views/checklist.py cms/djangoapps/contentstore/views/component.py cms/djangoapps/contentstore/views/course.py cms/djangoapps/models/settings/course_metadata.py common/djangoapps/student/tests/test_password_policy.py common/lib/xmodule/xmodule/modulestore/tests/django_utils.py common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py common/lib/xmodule/xmodule/modulestore/tests/test_split_draft_modulestore.py lms/djangoapps/analytics/basic.py lms/envs/common.py requirements/edx/base.txt requirements/edx/github.txt
