[Py3] Fixes problem with ETA and local timezones.  Closes #2306
Merge branch 'master' of github.com:celery/celery