Fix up tests for vacated settings

awx/main/tests/old/settings.py

@@ -46,6 +46,7 @@ TEST_TOWER_SETTINGS_MANIFEST = {
 }
 
 @override_settings(TOWER_SETTINGS_MANIFEST=TEST_TOWER_SETTINGS_MANIFEST)
+@pytest.mark.skip(reason="Settings deferred to 3.1")
 class SettingsPlaceholder(BaseTest):
 
     def setUp(self):

awx/main/tests/unit/api/test_views.py

@@ -16,7 +16,7 @@ class TestApiV1RootView:
             'authtoken',
             'ping',
             'config',
-            'settings',
+            #'settings',
             'me',
             'dashboard',
             'organizations',