Lettuce YouTube Check Improvements
Check YouTube for Bok-Choy
Merge pull request #3949 from edx/ammar/improve-lettuce-youtube-availability-check

Lettuce YouTube Check Improvements
Merge pull request #3948 from edx/ammar/check-youtube-for-bok-choy

Check YouTube for Bok-Choy
Adds Ben McMorran to authors file.
Merge pull request #3957 from edx/benmcmorran/authors

Adds Ben McMorran to authors file.
Merge branch 'release'

Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
	common/djangoapps/student/management/commands/create_random_users.py
	common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
	lms/djangoapps/bulk_email/forms.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/instructor/management/commands/openended_post.py
	lms/djangoapps/instructor/management/commands/openended_stats.py
	lms/djangoapps/instructor/tests/test_spoc_gradebook.py