Conflicts:
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/instructor_task/api.py

refined entrance exam student attempts reset
added rescore, delete state and task history functionality

Preserve enrollment_action and course_id querystring params in header 'Sign In' button

Update translations (autogenerated message)

Fix right margin of LinkedIn add-to-profile button

Finish LinkedIn button

Add client-side analytics event for LinkedIn Add to Profile button click.

Add management command for generating certs for testing.

Update styling of the certificate messages.

Rollback override of lazy definition loading for large courses.

Convert enrollment already exists errors to success.

TNL-716: Add possibility for notes creation via keyboard.

Include middleware database queries in Django debug toolbar

Pass 'lazy' parameter down properly into low-level definition caching.
Adjust mongo call numbers in tests and add missing bulk_op wrapper.
Avoids the loading of all definitions in a large course when only
specific, filtered definitions are needed to be loaded for an endpoint.

Calculator UI difficulit to access

Flakiness fix for cohort group selection TNL-1479

CSS Background Image used for important link

Awais786/ecom 1046 add cert btn

JIRA: https://openedx.atlassian.net/browse/MA-290

ECOM-1046 minor change in code. rename file name.

Skip intermittently failing test TE-572

Fix Pylint violations (easy)

Refactor registration endpoint and return field-specific detail in errors

Stop hitting the database when no courses are blocked.

skip intemittently failing test TE-745

Skip intermittently failing test_course_publish_signal_firing PLAT-449

Disable flakily failing JS tests TNL-559

skip paver bokchoy_coverage in jenkins