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
Merge branch '2014.7' into develop

Conflicts:
	salt/output/__init__.py
Merge pull request #16407 from s0undt3ch/hotfix/cache-loaded-configs

First attempt at caching the loaded configuration from the filesystem.
Merge branch '2014.7' into develop
salt-call/ssh, issue #16610:

Fix a regression when modules are called within an SLS
Merge pull request #16611 from cachedout/issue_16370_1

New onchanges/onfail failure types for requisite resolver
Revert "New onchanges/onfail failure types for requisite resolver"
Merge pull request #16612 from saltstack/revert-16611-issue_16370_1

Revert "New onchanges/onfail failure types for requisite resolver"
Update to latest stable bootstrap script v2014.10.14

* Fixed a regex issue with matching Salt's tags. Match v2014.7 but not 2014.7 as a valid tag
* Distro Support Added:
  * Added Linux Mint 17 support(Thanks Skyler Berg)
* Disrto Suuport Fixed:
  * Init pacman keys if not done so previously
Add no_use_wheel option to pip.install
Fix linting error
Add no_use_wheel option to pip.installed
Fix error message command argument
Fix linting error