fix grains filter_by function when using salt-ssh

very similar to #18238 and 7975b0a11
Merge branch 'salt-ssh-grains-fix' of https://github.com/slafs/salt into slafs-salt-ssh-grains-fix

Conflicts:
	salt/client/ssh/wrapper/grains.py
Add missign exception import
State `debconf.set_file` now accepts a template as a file

It follows the same convention as `file.managed` for example.

This also introduces a new function in the `debconfmod` module to set the
Debconf selections from a template or, as before, from a simple file.

Fixes #7331
Cleaning up lint
Removing unused import
Fix undefined _error() function, thanks to Pylint
Please pylint

My patch #18221 yesterday introduced new Pylint warnings/errors.

This fixes these warnings.
fixed confusion

Here it says clearly : http://salt-cloud.readthedocs.org/en/latest/topics/aws.html

EC2 instances can have a public or private IP, or both. When an instance is deployed, Salt Cloud needs to log into it via SSH to run the deploy script. By default, the public IP will be used for this. If the salt-cloud command is run from another EC2 instance, the private IP should be used.

my-ec2-config:
  # Specify whether to use public or private IP for deploy script
  # private_ips or public_ips
  ssh_interface: public_ips
Release 2014.7.0
Merge pull request #18271 from basepi/release2014.7.0

Release 2014.7.0
Use shlex_quote from six
Merge pull request #18270 from jmdcal/develop

fixed confusion
Merge pull request #18268 from multani/develop

Please pylint
Fix docker state documentation typo
Updated suse spec file to salt 2014.7
fix output of subsequent calls for ``environ.setenv`` state

Previously ``setenv`` function (from ``modules.environ``) was
called even if the environment was already in a proper state.
This caused ``highstate`` to always report changes to be applied
even if they were not required.
Merge pull request #18265 from nmadhok/clean-lint

Cleaning up lint
remove the leftovers from the previous file
Merge pull request #18262 from multani/fix/debconf-set-file-template

State `debconf.set_file` now accepts a template as a file