Merge pull request #9255 from s0undt3ch/develop

Revert "Use `vt.Terminal` to deploy VM's."
Recombinated the combobulator

Shh! No one tell @thatch45 that these have been in the repo for 2.5 years.
Changed conf-log to conf_log to match the other conf_* roles

@s0undt3ch Hope you don't mind.
Merge branch 'develop' of github.com:saltstack/salt into develop
Missed some more `set` occurrences.
Even more `set`'s!
Default tty based on ssh_user on gce
Merge pull request #9256 from techhat/gce

Default tty based on ssh_user on gce
Allow EC2 to list images based on owner
Add one more warning about large amounts of data
Merge pull request #9257 from techhat/ec2

Allow EC2 to list images based on owner
Don't just throw away call variables anymore in ec2
Don't just throw away call variables anymore in libcloudfuncs
Don't just throw away call variables anymore in digital_ocean
Don't just throw away call variables anymore in joyent
Don't just throw away call variables anymore in azure
Don't just throw away call variables anymore in nova
Don't just throw away call variables anymore in parallels
Don't just throw away call variables anymore in softlayer
Merge pull request #9258 from techhat/ec2

Don't just throw away call variables anymore in salt-cloud