Fix lint, fix boto module

salt/modules/boto_kms.py

@@ -64,7 +64,7 @@ try:
     # pylint: enable=unused-import
     logging.getLogger('boto').setLevel(logging.CRITICAL)
     HAS_BOTO = True
-except ImportError:
+except (ImportError, AttributeError):
     HAS_BOTO = False
 
 

salt/utils/win_functions.py

@@ -6,9 +6,6 @@ missing functions in other modules
 from __future__ import absolute_import
 from salt.exceptions import CommandExecutionError
 
-# Import Salt Libs
-import salt.utils
-
 # Import 3rd Party Libs
 try:
     import ntsecuritycon