Merge pull request #1 from s0undt3ch/hotfix/saltfile

Salfile
Fix test failures

http://jenkins.saltstack.com/job/salt-rs-rhel5/1511/
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge pull request #10108 from terminalmage/tests

Fix test failures
Fix TypeError stacktrace with cmd.run.
Remove log message
fix npm installed command
Merge pull request #10111 from cro/fix_only_10110

Fix only 10110
Strip leading path separator characters in a portable way.

Addresses the situation where get_id() ignores root_dir and always
looks for minion_id in /etc/salt/minion_id.

Fixes 10035
Merge pull request #10112 from izhukov/fix-npm-install-yo

fix npm installed command
Update dev_requirements in HACKING.rst-- filenames are changed now :)
Merge pull request #10114 from jacksontj/develop

Update dev_requirements in HACKING.rst-- filenames are changed now :)
Adding warning about old yamilify arg passing
pkg.installed/latest: don't refresh_db if refresh==False

See https://github.com/saltstack/salt/issues/5733#issuecomment-33888898
for further information.
Revert "Updated network io counter function."

This reverts commit e4d3d38ed5195cd0dc89b7d60464adbbbad67e07.

 - psutil.network_io_counters() isn't deprecated until psutil v1.0.0
Bunch of safeguards for utf8 errors in buildout module
Merge pull request #10118 from tedski/9301

Revert "Updated network io counter function."
Adding the ability to specify multiple iptables match options
Merge pull request #10121 from makinacorpus/buildout

Bunch of safeguards for utf8 errors in buildout module
Merge pull request #10122 from garethgreenaway/develop

Adding the ability to specify multiple iptables match options