diff --git a/cms/envs/acceptance.py b/cms/envs/acceptance.py
index d8fb8a606b86f3d41c9854918aec4a7bb48dc58b..62a42cb3f6a47da524941868e6ae11c6e00fa567 100644
--- a/cms/envs/acceptance.py
+++ b/cms/envs/acceptance.py
@@ -5,7 +5,7 @@ so that we can run the lettuce acceptance tests.
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .test import *
 from lms.envs.sauce import *
diff --git a/cms/envs/aws.py b/cms/envs/aws.py
index b43a00254a8c8850ca96edfa64c615047d20e10b..c73f8d0472ed995f34c70fb7a7c774d201be9e82 100644
--- a/cms/envs/aws.py
+++ b/cms/envs/aws.py
@@ -4,7 +4,7 @@ This is the default template for our main set of AWS servers.
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 import json
 
diff --git a/cms/envs/aws_migrate.py b/cms/envs/aws_migrate.py
index 7986d929fab23345eaf5afac2fbf8f181d20f973..e14834ec2d1e2335036c2f6a7c04a987c49ca71a 100644
--- a/cms/envs/aws_migrate.py
+++ b/cms/envs/aws_migrate.py
@@ -6,7 +6,7 @@ LMS with enough privileges to modify the database schema.
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 # Import everything from .aws so that our settings are based on those.
 from .aws import *
diff --git a/cms/envs/bok_choy.py b/cms/envs/bok_choy.py
index 6eab6cd22dcdb820b63106d633ce0c07e3722aee..f6235715338937bd7a4e8cf24c93d9128239f192 100644
--- a/cms/envs/bok_choy.py
+++ b/cms/envs/bok_choy.py
@@ -15,7 +15,7 @@ from path import path
 os.environ['SERVICE_VARIANT'] = 'bok_choy'
 os.environ['CONFIG_ROOT'] = path(__file__).abspath().dirname()  # pylint: disable=no-value-for-parameter
 
-from .aws import *  # pylint: disable=wildcard-import, W0614
+from .aws import *  # pylint: disable=wildcard-import, unused-wildcard-import
 
 ######################### Testing overrides ####################################
 
diff --git a/cms/envs/common.py b/cms/envs/common.py
index 1fc2423825cd9908549d2156715a95db1f358f4b..5b23f751c267a3c19560eb29d32d09ff8b5de3d2 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -22,7 +22,7 @@ Longer TODO:
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0611, W0614
+# pylint: disable=wildcard-import, W0611, unused-wildcard-import
 
 import imp
 import os
diff --git a/cms/envs/debug_upload.py b/cms/envs/debug_upload.py
index f4ef6aab8a08b7e040cda00db973ae36713c1356..e9282c6888b126d804b97640725addd842c52d82 100644
--- a/cms/envs/debug_upload.py
+++ b/cms/envs/debug_upload.py
@@ -2,7 +2,7 @@
 A new cms ENV configuration to use a slow upload file handler to help test
 progress bars in uploads
 """
-# pylint: disable=W0614
+# pylint: disable=unused-wildcard-import
 from .dev import *  # pylint: disable=wildcard-import
 
 FILE_UPLOAD_HANDLERS = (
diff --git a/cms/envs/dev.py b/cms/envs/dev.py
index 5bfbc0048d5e5ab8e90cb48b453b7d06f8c0ad9a..a82da4cfcdec5bc7d742746a2c0182a4546bc7dc 100644
--- a/cms/envs/dev.py
+++ b/cms/envs/dev.py
@@ -3,7 +3,7 @@ This config file runs the simplest dev environment"""
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .common import *
 from logsettings import get_logger_config
diff --git a/cms/envs/dev_dbperf.py b/cms/envs/dev_dbperf.py
index 9942280ba1d26d3bf014618fd3e012d7f1d1f82a..610a974e3f54a9c40fc180bdf5d83a386c4cafc8 100644
--- a/cms/envs/dev_dbperf.py
+++ b/cms/envs/dev_dbperf.py
@@ -4,7 +4,7 @@ This configuration is to turn on the Django Toolbar stats for DB access stats, f
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .dev import *
 
diff --git a/cms/envs/dev_ike.py b/cms/envs/dev_ike.py
index 13d474a59bded2f32f693960447284d5ca29c9e5..c593bdcdeb6d733794e1a76ae810ffc0eb9303a8 100644
--- a/cms/envs/dev_ike.py
+++ b/cms/envs/dev_ike.py
@@ -1,6 +1,6 @@
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 # dev environment for ichuang/mit
 
diff --git a/cms/envs/dev_shared_preview.py b/cms/envs/dev_shared_preview.py
index cf5e021ac88f6f63be28a7e5681e8f73c618a03c..98c8fa7b156119cabd21f4f3316b1f1044eab998 100644
--- a/cms/envs/dev_shared_preview.py
+++ b/cms/envs/dev_shared_preview.py
@@ -5,7 +5,7 @@ the same process between preview and published
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .dev import *
 
diff --git a/cms/envs/dev_with_worker.py b/cms/envs/dev_with_worker.py
index cac84cb09918c1db85c552863485d39d4b44d695..40f6ed4e1ff18188f44d0d88727949ea4501cd31 100644
--- a/cms/envs/dev_with_worker.py
+++ b/cms/envs/dev_with_worker.py
@@ -10,7 +10,7 @@ django_admin.py celery worker
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from dev import *
 
diff --git a/cms/envs/microsite_test.py b/cms/envs/microsite_test.py
index 724ca277f32bd170dbb7f5cfe44ca2a58d81314e..f84d5876137e339a94498ad7be9bf00d19ecf32d 100644
--- a/cms/envs/microsite_test.py
+++ b/cms/envs/microsite_test.py
@@ -3,7 +3,7 @@ This is a localdev test for the Microsite processing pipeline
 """
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .dev import *
 
diff --git a/cms/envs/test.py b/cms/envs/test.py
index e8e4e7d80e0b62b733eef7741ca3bc4aec784a66..8ee1bcb625544129db04393605b5b6523dad5911 100644
--- a/cms/envs/test.py
+++ b/cms/envs/test.py
@@ -10,7 +10,7 @@ sessions. Assumes structure:
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .common import *
 import os
diff --git a/common/djangoapps/terrain/steps.py b/common/djangoapps/terrain/steps.py
index ced2aa6780e341863322c565afd34740fbc8720f..5ea05ddec2effafb2fe6e6f163ae5471f5fb6044 100644
--- a/common/djangoapps/terrain/steps.py
+++ b/common/djangoapps/terrain/steps.py
@@ -6,7 +6,7 @@
 # pylint: disable=wildcard-import
 
 # Disable the "Unused import %s from wildcard import" warning
-# pylint: disable=W0614
+# pylint: disable=unused-wildcard-import
 
 # Disable the "unused argument" warning because lettuce uses "step"
 # pylint: disable=unused-argument
diff --git a/lms/envs/acceptance.py b/lms/envs/acceptance.py
index 6a3e6ddf7a30773ce401b78906ba14273c945a36..60509a12bfd7250a1d354b6a48e30bf65c28ed8f 100644
--- a/lms/envs/acceptance.py
+++ b/lms/envs/acceptance.py
@@ -5,7 +5,7 @@ so that we can run the lettuce acceptance tests.
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .test import *
 from .sauce import *
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index eb5e4b4dcaeabbc80808db2916c8776bac13fb58..bacd50a31ef5b01dfbacc80f5ef14b6180c0da38 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -9,7 +9,7 @@ Common traits:
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 import json
 
diff --git a/lms/envs/aws_migrate.py b/lms/envs/aws_migrate.py
index 7986d929fab23345eaf5afac2fbf8f181d20f973..e14834ec2d1e2335036c2f6a7c04a987c49ca71a 100644
--- a/lms/envs/aws_migrate.py
+++ b/lms/envs/aws_migrate.py
@@ -6,7 +6,7 @@ LMS with enough privileges to modify the database schema.
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 # Import everything from .aws so that our settings are based on those.
 from .aws import *
diff --git a/lms/envs/bok_choy.py b/lms/envs/bok_choy.py
index 3974a9619d51bf7aa09b3578c77d3e8846260c8f..fbb2d6ef70656e468d1b045b400a032599000fe3 100644
--- a/lms/envs/bok_choy.py
+++ b/lms/envs/bok_choy.py
@@ -18,7 +18,7 @@ TEST_ROOT = CONFIG_ROOT.dirname().dirname() / "test_root"
 os.environ['SERVICE_VARIANT'] = 'bok_choy'
 os.environ['CONFIG_ROOT'] = CONFIG_ROOT
 
-from .aws import *  # pylint: disable=wildcard-import, W0614
+from .aws import *  # pylint: disable=wildcard-import, unused-wildcard-import
 
 
 ######################### Testing overrides ####################################
diff --git a/lms/envs/cms/aws.py b/lms/envs/cms/aws.py
index d16408afcfd543f7e5ab7b92eba4cf3fc597bd5e..fa93670f00ad419918206e9dbd82f38c54abdbdf 100644
--- a/lms/envs/cms/aws.py
+++ b/lms/envs/cms/aws.py
@@ -4,7 +4,7 @@ Settings for the LMS that runs alongside the CMS on AWS
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from ..aws import *
 
diff --git a/lms/envs/cms/dev.py b/lms/envs/cms/dev.py
index 622ff1e709115ee7c0e996548f7d403cda8e700e..0669147d0f317578012d31b6bb6782e85f2a7847 100644
--- a/lms/envs/cms/dev.py
+++ b/lms/envs/cms/dev.py
@@ -4,7 +4,7 @@ Settings for the LMS that runs alongside the CMS on AWS
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from ..dev import *
 
diff --git a/lms/envs/cms/microsite_test.py b/lms/envs/cms/microsite_test.py
index 15ed0a535aa16639152a57e1d478deed711f61e4..586e357e85ee5a7491918dde9f51ab92d1fa8110 100644
--- a/lms/envs/cms/microsite_test.py
+++ b/lms/envs/cms/microsite_test.py
@@ -3,7 +3,7 @@ This is a localdev test for the Microsite processing pipeline
 """
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .dev import *
 from ..dev import ENV_ROOT, FEATURES
diff --git a/lms/envs/common.py b/lms/envs/common.py
index dc02a16ad1e92c07220c6eda295ecd4cbaae63bf..e4053e7bb774cea2beba56d2dc188ec26e57ed53 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -22,8 +22,7 @@ Longer TODO:
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0611, W0614, invalid-name
-
+# pylint: disable=wildcard-import, W0611, unused-wildcard-import, invalid-name
 
 import sys
 import os
diff --git a/lms/envs/content.py b/lms/envs/content.py
index 1606e7e9a81c70730cc0ef30182ca7f63dcd7ac3..90c9f8a0fbf57646a222d1cf0778f74d84856391 100644
--- a/lms/envs/content.py
+++ b/lms/envs/content.py
@@ -5,7 +5,7 @@ between dev machines and AWS machines.
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .aws import *
 
diff --git a/lms/envs/dev.py b/lms/envs/dev.py
index 77cdb69113d1a035e2240ebea0d95e9e400069e8..85ce3e390629ed0874590323ab937fa93c212852 100644
--- a/lms/envs/dev.py
+++ b/lms/envs/dev.py
@@ -10,7 +10,7 @@ sessions. Assumes structure:
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .common import *
 from logsettings import get_logger_config
diff --git a/lms/envs/dev_ike.py b/lms/envs/dev_ike.py
index f39911f144a30e8944b551ca8dfb4aac32610847..9aea2f0e1086601a79d812b88a1991792d07f828 100644
--- a/lms/envs/dev_ike.py
+++ b/lms/envs/dev_ike.py
@@ -10,7 +10,7 @@ sessions. Assumes structure:
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .common import *
 from .dev import *
diff --git a/lms/envs/dev_int.py b/lms/envs/dev_int.py
index 15367119e2dd5cada3b46a5d703a242fc3fbc958..f6e5ef028e4fc3139b18fca504cc82b2083bb4d4 100644
--- a/lms/envs/dev_int.py
+++ b/lms/envs/dev_int.py
@@ -12,7 +12,7 @@ use *.dev domains instead for local testing.
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .dev import *
 
diff --git a/lms/envs/dev_with_worker.py b/lms/envs/dev_with_worker.py
index cac84cb09918c1db85c552863485d39d4b44d695..40f6ed4e1ff18188f44d0d88727949ea4501cd31 100644
--- a/lms/envs/dev_with_worker.py
+++ b/lms/envs/dev_with_worker.py
@@ -10,7 +10,7 @@ django_admin.py celery worker
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from dev import *
 
diff --git a/lms/envs/devgroups/courses.py b/lms/envs/devgroups/courses.py
index d170f372e7172230cb69363e1210236b1d654922..edf7484bbfa9d5ef68c1fe084a8662021713b717 100644
--- a/lms/envs/devgroups/courses.py
+++ b/lms/envs/devgroups/courses.py
@@ -1,7 +1,7 @@
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from ..dev import *
 
diff --git a/lms/envs/devgroups/h_cs50.py b/lms/envs/devgroups/h_cs50.py
index a82f3f90e2ed0a732bd8a8d87527d733e475f35f..2c64946a3f2f788261c113ce744a8382095c9fba 100644
--- a/lms/envs/devgroups/h_cs50.py
+++ b/lms/envs/devgroups/h_cs50.py
@@ -1,7 +1,7 @@
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .courses import *
 
diff --git a/lms/envs/devgroups/m_6002.py b/lms/envs/devgroups/m_6002.py
index eb96cdda8bfe88a087a566f93c2a74f17d449697..5df2a33440b4450e5ca688349e98cb36021426c2 100644
--- a/lms/envs/devgroups/m_6002.py
+++ b/lms/envs/devgroups/m_6002.py
@@ -1,7 +1,7 @@
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .courses import *
 
diff --git a/lms/envs/devgroups/portal.py b/lms/envs/devgroups/portal.py
index f8c1d015b63f7ad0a1c76fe2a98eb8dd25c217dc..e972d9f36c3d5710ace6f58beede53a5276c8e76 100644
--- a/lms/envs/devgroups/portal.py
+++ b/lms/envs/devgroups/portal.py
@@ -5,7 +5,7 @@ get shared sessions)
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from courses import *
 
diff --git a/lms/envs/discussionsettings.py b/lms/envs/discussionsettings.py
index 1ac4c23af8fa0f1dce218a40adce26baca1c7492..f32fb43e4472c18c2789e0aadc593a94b4b97890 100644
--- a/lms/envs/discussionsettings.py
+++ b/lms/envs/discussionsettings.py
@@ -1,5 +1,5 @@
 
 # We intentionally define variables that aren't used
-# pylint: disable=W0614
+# pylint: disable=unused-wildcard-import
 
 DISCUSSION_ALLOWED_UPLOAD_FILE_TYPES = ('.jpg', '.jpeg', '.gif', '.bmp', '.png', '.tiff')
diff --git a/lms/envs/edx4edx_aws.py b/lms/envs/edx4edx_aws.py
index 151a6556d3d1ebc5279e27be2e3d8de8cf5ec760..4ff2133e7b4e16798da46b7f51035824953ff4a3 100644
--- a/lms/envs/edx4edx_aws.py
+++ b/lms/envs/edx4edx_aws.py
@@ -1,6 +1,6 @@
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 # Settings for edx4edx production instance
 from .aws import *
diff --git a/lms/envs/load_test.py b/lms/envs/load_test.py
index b81ee45587f3774729f866bd4f5f1cc261ffeff7..c21e2265276c7713719f63fb8991687972e8d0b9 100644
--- a/lms/envs/load_test.py
+++ b/lms/envs/load_test.py
@@ -4,7 +4,7 @@ Settings for load testing.
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .aws import *
 
diff --git a/lms/envs/sauce.py b/lms/envs/sauce.py
index 80ca002c746f54115cb5d3e1785b603c723ad55c..c8c7577ed5e7d70fb0f40b86c2ac684d67c798a6 100644
--- a/lms/envs/sauce.py
+++ b/lms/envs/sauce.py
@@ -5,7 +5,7 @@ so that we can run the lettuce acceptance tests on SauceLabs.
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
 import os
diff --git a/lms/envs/static.py b/lms/envs/static.py
index 8c13f7daeaa9a6607fb4d6fa09beabf5d47815e1..101d790420548417ab6a2b630a086c400a8173bc 100644
--- a/lms/envs/static.py
+++ b/lms/envs/static.py
@@ -10,7 +10,7 @@ sessions. Assumes structure:
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .common import *
 from logsettings import get_logger_config
diff --git a/lms/envs/test.py b/lms/envs/test.py
index 509860a28fb1c678111d048088d660fdcd803aec..de74f29c0fdbf3ab5d3f3cecee44d6919da0b644 100644
--- a/lms/envs/test.py
+++ b/lms/envs/test.py
@@ -10,7 +10,7 @@ sessions. Assumes structure:
 
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
-# pylint: disable=wildcard-import, W0614
+# pylint: disable=wildcard-import, unused-wildcard-import
 
 from .common import *
 import os