Align highstate output
Use netstat on sunos: fixups

Make it DRYer, should no longer fail lint.
Fix spelling error
Fix duplicate word
Merge pull request #15422 from nshalman/issue-14184

Use netstat on sunos.
Merge pull request #15445 from cachedout/issue_15418

Align highstate output
Merge branch '2014.7' into develop

Conflicts:
	salt/utils/network.py