Use new setting for LMS deadline display instead TIME_ZONE
Merge pull request #2676 from edx/jbau/timezone-hotfix

Use new setting for LMS deadline display instead TIME_ZONE
Merge branch 'release'

Conflicts:
	lms/templates/courseware/accordion.html