Merge pull request #2 from jacksontj/thatch45/prereq_bad_data

Add __run_num__ and __sls__ to prereq failure condition
Merge pull request #15474 from thatch45/prereq_bad_data

This fixes a bad data output when prereq prerequireds break
Merge pull request #15475 from thatch45/ssh_user_iso

Ssh user iso
Migrate salt.cloud.exceptions to salt.exceptions

This means that we no longer have to load salt.cloud when calling the
salt cli and paves the way for additional sandboxing of salt-cloud to avoid
unecessary imports.
Add salt-api unit file symlink
Merge pull request #15480 from terminalmage/add-unit-file

Add salt-api unit file symlink
Remove what seem to be unused imports.
Fix tests and lint
Missed one lint
Bring boto modules from develop to 2014.7
Bring boto states from develop to 2014.7
Bring boto module tests from develop to 2014.7
Bring boto state tests from develop to 2014.7
Merge pull request #15479 from cachedout/no_cloud

Migrate salt.cloud.exceptions to salt.exceptions
salt/utils/process.py: fix order of args to os.kill()

Fixes: #15269
Signed-off-by: Dan Mick <dan.mick@inktank.com>
clean up the last of extension stuff in novaclient
Fixing sphinx errors and violations
More sphinx errors and violations
Fixing more sphinx errors and violations
Fix salt.modules.mount.active to use /proc/self/mounts, unless user explicitly enabled use of /proc/self/mountinfo via extended=True option. Fix remount on every state application, when options that don't appear in /proc/self/mounts are used.