Fixed #20972 -- Make messages cookie follow session cookie secure/httponly
Fixed #20693 -- Add timezone support to built-in time filter.

Modified django.utils.dateformat module, moving __init__() method and
timezone-related format methods from DateFormat class to TimeFormat
base class. Modified timezone-related format methods to return an
empty string when timezone is inappropriate for input value.
Merge branch 'master' into cookies-settings-refactor

Conflicts:
	django/contrib/messages/storage/cookie.py
	django/contrib/messages/tests/test_cookie.py