Merge branch '2014.7' into develop

Conflicts:
	doc/faq.rst
	doc/ref/configuration/minion.rst
	salt/minion.py
	salt/states/pkg.py
	salt/transport/__init__.py
fix absent key dir
Fix encoding issue with collateral damages...
Better test for output stream existence
Another fix for outputter reliability
display traceback in test error
pep8
tolerant encoding print in print_cli
create new file if not already present
fix ini_manage lint error
Fix missed merge conflict on develop
Yaml dump a dict, rather than an odict for boto_asg cloud-config
Update ACL docs to include @jobs markup
Merge pull request #16604 from rallytime/pylint_fix

Fix missed merge conflict on develop
Merge pull request #16587 from terminalmage/issue16583

Don't yamlify args containing only digits and underscores
Merge pull request #16601 from rallytime/bp-16591

Backport #16591 to 2014.7
Merge pull request #16602 from rallytime/bp-16572

Backport #16572 to 2014.7
Merge pull request #16603 from rallytime/bp-16385

Backport #16385 to 2014.7
Merge pull request #16609 from jacksontj/2014.7

Update ACL docs to include @jobs markup
Merge pull request #16608 from lyft/fix-cloud-config-in-boto-asg

Yaml dump a dict, rather than an odict for boto_asg cloud-config