Pylint fixes.
Merge pull request #8650 from cro/pylint_19nov

Pylint fixes.
Revert "Provide a default conf_dir to look in for cloud.deploy.d"

This reverts commit 8f043ec8414df0563205ca23402e33489842732d.
Make `show_instance` global before name spacing it.
Handle the deprecated libcloud attributes.
Fix the order in which the configuration is updated.
use modern 'except FooErr as bar:' syntax
make gnomedesktop._GSettings a new-style class
map -> map_, to avoid shadowing built-in map() func
Merge pull request #8657 from cvrebert/patch-2

map -> map_, to avoid shadowing built-in map() func
libcloud_aws: rm unused import

salt/cloud/clouds/libcloud_aws.py:50: [W0611(unused-import), ] Unused import copy
salt.log.setup: rm unused import

salt/log/setup.py:36: [W0611(unused-import), ] Unused import string_types
modules.aws_sqs: rm unused import

salt/modules/aws_sqs.py:9: [W0611(unused-import), ] Unused import CommandExecutionError
use aliases to avoid shadowing built-in set type
client.ssh.state.SSHState.load_modules: avoid shadowing locals() built-in
doesn't make sense for get() to take a `value` arg

salt/modules/gnomedesktop.py:242: [W0613(unused-argument), get] Unused argument 'value'
streamline nova.server_show() & avoid shadowing server_list()
s3fs: fix typo in comment
Merge pull request #8655 from hulu/use-except-as

use modern 'except FooErr as bar:' syntax
Merge pull request #8659 from cvrebert/patch-3

libcloud_aws: rm unused import