Better trace for nested jinja errors
Make usage of source_hash more flexible.
	modified:   salt/modules/file.py
	modified:   salt/states/file.py
Make usage of source_hash more flexible.
	modified:   salt/modules/file.py
	modified:   salt/states/file.py
Make sure master_uri is set correctly when using client api
Fix #9239 - include pkg in source dist tarball
Possible fix for #5649

* Rewrite a client's interface directive to localhost if it's set to 0.0.0.0.
Adding ipv6 validation
Adding hwaddr_interfaces to grains, it permit to target minion based on Mac Address
Add note about upstart to resource limits documentation
Merge pull request #9491 from terminalmage/docs

Add note about upstart to resource limits documentation
Remove clusted methods, they were never used
Merge pull request #9409 from makinacorpus/test-trace

Better trace for nested jinja errors
Increase timeout for pkg tests.

* Since we started running a refresh_db in pkgrepo (7c3d0cc80db5d455fde8cd5044a3dc91bfa272f0), we may be checking an exit code prematurely. This increases the timeouts to 120 seconds to see if Jenkins will calm itself.
Merge pull request #9489 from cachedout/#5649

Rewrite interface directive to localhost if 0.0.0.0
Merge pull request #9492 from cachedout/unit-tests

Increase timeout for pkg tests.
Merge branch 'salt_transport_fix_1' of git://github.com/cro/salt into cro-salt_transport_fix_1

Conflicts:
	salt/config.py
Make ClearFuncs helper functions private
Merge pull request #9493 from terminalmage/private-clearfuncs

Make ClearFuncs helper functions private
Merge pull request #9481 from techhat/ipv6

Adding ipv6 validation
Merge pull request #9490 from yannj-fr/develop

Adding hwaddr_interfaces to grains, it permit to target minion based on ...