Merge remote-tracking branch 'upstream/master' into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Add force_reload for debian_service, upstart and systemd and use it as default in mod_watch if available
Remove unused import.
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
change from jinja's PackageLoader to FileSystemLoader

this removes the dependency on distribute (setuptools) at runtime.
added some checks around each of the calls to get_template, to
catch the exception thrown when the template environment cannot be
loaded by the FileSystemLoader.

a good TODO / follow-up to this would be to enhance
states/network.py to better handle the situations this creates...
coding style changes for issue #2941

- update import os and use os.sep
- import the specific jinja2.exceptions exception and catch it by
  name rather than catching generic "Exception"
fixing os.path import and function use as mentioned in #2928

thatch45 comment that we don't want to import the exists and join
functions into this module "bare" as they would then be totally
exposed to salt (and callable from salt, e.g., rh_ip.exists),
which we don't want.  this change fixes that and calls the functions
as os.path.exists and os.path.join instead.
Match Arch's PKGBUILD files with those in the AUR
Match Arch's PKGBUILD files with those in the AUR
added check for existing /etc/localtime before unlinking
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #2966 from cedwards/freebsd

added check for existing /etc/localtime before unlinking
Fix typo
Add missing colons
Merge pull request #2961 from rizumu/develop

Match Arch's PKGBUILD files with those in the AUR (develop branch)