updated timezone.py with osfamily Suse
This will fix issue #3806
Merge pull request #3810 from aboe76/suse_support_timezone.py

updated timezone.py with osfamily Suse issue #3807 fix
Change xinetd handling to be more backwards compatible.
Merge branch 'develop' of github.com:saltstack/salt into develop
Revert "Change xinetd handling to be more backwards compatible."

This reverts commit 984ba57a05ca852e48268cbe7fb9376e29f40b38.
Change xinetd handling to be more backwards compatible.
Merge remote-tracking branch 'origin/develop' into develop