Backport #18169 to 2014.1

Backport #18169 to 2014.1

Conflicts:
	salt/modules/timezone.py