diff --git a/awx/ui/client/src/credential-types/edit/edit.controller.js b/awx/ui/client/src/credential-types/edit/edit.controller.js
index 2fffb31fd9..9437ed6065 100644
--- a/awx/ui/client/src/credential-types/edit/edit.controller.js
+++ b/awx/ui/client/src/credential-types/edit/edit.controller.js
@@ -18,7 +18,7 @@ export default ['Rest', 'Wait',
             data = credential_typeData,
             id = credential_typeData.id,
             form = CredentialTypesForm,
-            master = {},
+            main = {},
             url = GetBasePath('credential_types');
 
         init();
@@ -123,7 +123,7 @@ export default ['Rest', 'Wait',
                 for (fld in form.fields) {
                     if (data[fld]  && fld !== 'inputs' || fld !== 'injectors') {
                         $scope[fld] = data[fld];
-                        master[fld] = data[fld];
+                        main[fld] = data[fld];
                     }
 
                     if (fld === "kind") {
@@ -131,7 +131,7 @@ export default ['Rest', 'Wait',
                         for (i = 0; i < $scope.credential_kind_options.length; i++) {
                             if ($scope.kind === $scope.credential_kind_options[i].value) {
                                 $scope.kind = $scope.credential_kind_options[i];
-                                master[fld] = $scope.credential_kind_options[i];
+                                main[fld] = $scope.credential_kind_options[i];
                                 break;
                             }
                         }
diff --git a/awx/ui/client/src/inventory-scripts/edit/edit.controller.js b/awx/ui/client/src/inventory-scripts/edit/edit.controller.js
index 5bd7ee8f19..863737a8c4 100644
--- a/awx/ui/client/src/inventory-scripts/edit/edit.controller.js
+++ b/awx/ui/client/src/inventory-scripts/edit/edit.controller.js
@@ -17,7 +17,7 @@ export default ['Rest', 'Wait',
             data = inventory_scriptData,
             id = inventory_scriptData.id,
             form = InventoryScriptsForm,
-            master = {},
+            main = {},
             url = GetBasePath('inventory_scripts');
 
         init();
@@ -35,14 +35,14 @@ export default ['Rest', 'Wait',
             for (fld in form.fields) {
                 if (data[fld]) {
                     $scope[fld] = data[fld];
-                    master[fld] = data[fld];
+                    main[fld] = data[fld];
                 }
 
                 if (form.fields[fld].sourceModel && data.summary_fields &&
                     data.summary_fields[form.fields[fld].sourceModel]) {
                     $scope[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField] =
                         data.summary_fields[form.fields[fld].sourceModel][form.fields[fld].sourceField];
-                    master[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField] =
+                    main[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField] =
                         data.summary_fields[form.fields[fld].sourceModel][form.fields[fld].sourceField];
                 }
             }
diff --git a/awx/ui/client/src/notifications/edit/edit.controller.js b/awx/ui/client/src/notifications/edit/edit.controller.js
index 10a59238bf..eb98ad83da 100644
--- a/awx/ui/client/src/notifications/edit/edit.controller.js
+++ b/awx/ui/client/src/notifications/edit/edit.controller.js
@@ -23,7 +23,7 @@ export default ['Rest', 'Wait',
         var generator = GenerateForm,
             id = notification_template.id,
             form = NotificationsFormObject,
-            master = {},
+            main = {},
             url = GetBasePath('notification_templates'),
             defaultMessages = {};
 
@@ -73,25 +73,25 @@ export default ['Rest', 'Wait',
                     for (fld in form.fields) {
                         if (data[fld]) {
                             $scope[fld] = data[fld];
-                            master[fld] = data[fld];
+                            main[fld] = data[fld];
                         }
 
                         if(data.notification_configuration.use_ssl === true){
                             $scope.email_options = "use_ssl";
-                            master.email_options = "use_ssl";
+                            main.email_options = "use_ssl";
                             $scope.use_ssl = true;
-                            master.use_ssl = true;
+                            main.use_ssl = true;
                             $scope.use_tls = false;
-                            master.use_tls = false;
+                            main.use_tls = false;
                         }
 
                         if(data.notification_configuration.use_tls === true){
                             $scope.email_options = "use_tls";
-                            master.email_options = "use_tls";
+                            main.email_options = "use_tls";
                             $scope.use_ssl = false;
-                            master.use_ssl = false;
+                            main.use_ssl = false;
                             $scope.use_tls = true;
-                            master.use_tls = true;
+                            main.use_tls = true;
                         }
 
                         if (data.notification_configuration.timeout === null ||
@@ -101,7 +101,7 @@ export default ['Rest', 'Wait',
 
                         if (data.notification_configuration[fld]) {
                             $scope[fld] = data.notification_configuration[fld];
-                            master[fld] = data.notification_configuration[fld];
+                            main[fld] = data.notification_configuration[fld];
 
                             if (form.fields[fld].type === 'textarea') {
                                 if (form.fields[fld].name === 'headers') {
@@ -116,7 +116,7 @@ export default ['Rest', 'Wait',
                             data.summary_fields[form.fields[fld].sourceModel]) {
                             $scope[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField] =
                                 data.summary_fields[form.fields[fld].sourceModel][form.fields[fld].sourceField];
-                            master[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField] =
+                            main[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField] =
                                 data.summary_fields[form.fields[fld].sourceModel][form.fields[fld].sourceField];
                         }
                     }
@@ -128,7 +128,7 @@ export default ['Rest', 'Wait',
                         }
                     }
 
-                    master.notification_type = $scope.notification_type;
+                    main.notification_type = $scope.notification_type;
                     CreateSelect2({
                         element: '#notification_template_notification_type',
                         multiple: false
diff --git a/awx/ui/client/src/organizations/edit/organizations-edit.controller.js b/awx/ui/client/src/organizations/edit/organizations-edit.controller.js
index f0e018c4b7..74397b02cc 100644
--- a/awx/ui/client/src/organizations/edit/organizations-edit.controller.js
+++ b/awx/ui/client/src/organizations/edit/organizations-edit.controller.js
@@ -14,7 +14,7 @@ export default ['$scope', '$location', '$stateParams', 'isOrgAdmin', 'isNotifica
         let form = OrganizationForm(),
             defaultUrl = GetBasePath('organizations'),
             base = $location.path().replace(/^\//, '').split('/')[0],
-            master = {},
+            main = {},
             id = $stateParams.organization_id,
             instance_group_url = defaultUrl + id + '/instance_groups/';
 
@@ -55,7 +55,7 @@ export default ['$scope', '$location', '$stateParams', 'isOrgAdmin', 'isNotifica
             for (fld in form.fields) {
                 if (typeof data[fld] !== 'undefined') {
                     $scope[fld] = data[fld];
-                    master[fld] = data[fld];
+                    main[fld] = data[fld];
                 }
             }
 
@@ -112,7 +112,7 @@ export default ['$scope', '$location', '$stateParams', 'isOrgAdmin', 'isNotifica
                             });
                         });
                     $scope.organization_name = $scope.name;
-                    master = params;
+                    main = params;
                 })
                 .catch(({data, status}) => {
                     ProcessErrors($scope, data, status, OrganizationForm, {
@@ -166,4 +166,4 @@ export default ['$scope', '$location', '$stateParams', 'isOrgAdmin', 'isNotifica
 
         };
     }
-];
\ No newline at end of file
+];
diff --git a/awx/ui/client/src/projects/add/projects-add.controller.js b/awx/ui/client/src/projects/add/projects-add.controller.js
index 1983d4d465..c34a6ecdf2 100644
--- a/awx/ui/client/src/projects/add/projects-add.controller.js
+++ b/awx/ui/client/src/projects/add/projects-add.controller.js
@@ -15,7 +15,7 @@ export default ['$scope', '$location', '$stateParams', 'GenerateForm',
         let form = ProjectsForm(),
             base = $location.path().replace(/^\//, '').split('/')[0],
             defaultUrl = GetBasePath('projects'),
-            master = {};
+            main = {};
 
         init();
 
@@ -46,7 +46,7 @@ export default ['$scope', '$location', '$stateParams', 'GenerateForm',
             GenerateForm.applyDefaults(form, $scope);
         }
 
-        GetProjectPath({ scope: $scope, master: master });
+        GetProjectPath({ scope: $scope, main: main });
 
         if ($scope.removeChoicesReady) {
             $scope.removeChoicesReady();
@@ -67,7 +67,7 @@ export default ['$scope', '$location', '$stateParams', 'GenerateForm',
             });
 
             $scope.scmRequired = false;
-            master.scm_type = $scope.scm_type;
+            main.scm_type = $scope.scm_type;
         });
 
         // Load the list of options for Kind
diff --git a/awx/ui/client/src/projects/edit/projects-edit.controller.js b/awx/ui/client/src/projects/edit/projects-edit.controller.js
index a793425d26..27f6d3b376 100644
--- a/awx/ui/client/src/projects/edit/projects-edit.controller.js
+++ b/awx/ui/client/src/projects/edit/projects-edit.controller.js
@@ -17,7 +17,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'ProjectsForm', 'Rest',
 
         let form = ProjectsForm(),
             defaultUrl = GetBasePath('projects') + $stateParams.project_id + '/',
-            master = {},
+            main = {},
             id = $stateParams.project_id;
 
         $scope.project_local_paths = [];
@@ -46,7 +46,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'ProjectsForm', 'Rest',
             $scope.projectLoadedRemove();
         }
         $scope.projectLoadedRemove = $scope.$on('projectLoaded', function() {
-            GetProjectPath({ scope: $scope, master: master });
+            GetProjectPath({ scope: $scope, main: main });
 
             $scope.pathRequired = ($scope.scm_type.value === 'manual') ? true : false;
             $scope.scmRequired = ($scope.scm_type.value !== 'manual') ? true : false;
@@ -76,19 +76,19 @@ export default ['$scope', '$rootScope', '$stateParams', 'ProjectsForm', 'Rest',
                         if (form.fields[fld].type === 'checkbox_group') {
                             for (i = 0; i < form.fields[fld].fields.length; i++) {
                                 $scope[form.fields[fld].fields[i].name] = data[form.fields[fld].fields[i].name];
-                                master[form.fields[fld].fields[i].name] = data[form.fields[fld].fields[i].name];
+                                main[form.fields[fld].fields[i].name] = data[form.fields[fld].fields[i].name];
                             }
                         } else {
                             if (data[fld] !== undefined) {
                                 $scope[fld] = data[fld];
-                                master[fld] = data[fld];
+                                main[fld] = data[fld];
                             }
                         }
                         if (form.fields[fld].sourceModel && data.summary_fields &&
                             data.summary_fields[form.fields[fld].sourceModel]) {
                             $scope[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField] =
                                 data.summary_fields[form.fields[fld].sourceModel][form.fields[fld].sourceField];
-                            master[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField] =
+                            main[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField] =
                                 data.summary_fields[form.fields[fld].sourceModel][form.fields[fld].sourceField];
                         }
                     }
@@ -109,7 +109,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'ProjectsForm', 'Rest',
                         $scope.scmRequired = false;
                     }
 
-                    master.scm_type = $scope.scm_type;
+                    main.scm_type = $scope.scm_type;
                     CreateSelect2({
                         element: '#project_scm_type',
                         multiple: false
diff --git a/awx/ui/client/src/projects/factories/get-project-path.factory.js b/awx/ui/client/src/projects/factories/get-project-path.factory.js
index 6d8f7adedd..f6423bb23b 100644
--- a/awx/ui/client/src/projects/factories/get-project-path.factory.js
+++ b/awx/ui/client/src/projects/factories/get-project-path.factory.js
@@ -2,7 +2,7 @@ export default
     function GetProjectPath(i18n, Rest, GetBasePath, ProcessErrors) {
         return function(params) {
             var scope = params.scope,
-                master = params.master;
+                main = params.main;
 
             function arraySort(data) {
                 //Sort nodes by name
@@ -54,8 +54,8 @@ export default
                         }
                     }
                     scope.base_dir = data.project_base_dir || i18n._('You do not have access to view this property');
-                    master.local_path = scope.local_path;
-                    master.base_dir = scope.base_dir; // Keep in master object so that it doesn't get
+                    main.local_path = scope.local_path;
+                    main.base_dir = scope.base_dir; // Keep in main object so that it doesn't get
                     // wiped out on form reset.
                     if (opts.length === 0) {
                         // trigger display of alert block when scm_type == manual
diff --git a/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js b/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js
index 6e855eb0a5..a7efb2e550 100644
--- a/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js
+++ b/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js
@@ -24,7 +24,7 @@
             let defaultUrl = GetBasePath('job_templates'),
                 form = JobTemplateForm(),
                 generator = GenerateForm,
-                master = {},
+                main = {},
                 selectPlaybook, checkSCMStatus,
                 callback;
 
@@ -157,14 +157,14 @@
 
             hashSetup({
                 scope: $scope,
-                master: master,
+                main: main,
                 check_field: 'allow_callbacks',
                 default_val: false
             });
             CallbackHelpInit({ scope: $scope });
             // set initial vals for webhook checkbox
             $scope.enable_webhook = false;
-            master.enable_webhook = false;
+            main.enable_webhook = false;
 
             $scope.surveyTooltip = i18n._('Please save before adding a survey to this job template.');
 
diff --git a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
index 96ec52fd90..03d76c85fd 100644
--- a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
+++ b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
@@ -41,7 +41,7 @@ export default
             let defaultUrl = GetBasePath('job_templates'),
                 generator = GenerateForm,
                 form = JobTemplateForm(),
-                master = {},
+                main = {},
                 id = $stateParams.job_template_id,
                 callback,
                 choicesCount = 0,
@@ -470,15 +470,15 @@ export default
             if ($scope.jobTemplateLoadedRemove) {
                 $scope.jobTemplateLoadedRemove();
             }
-            $scope.jobTemplateLoadedRemove = $scope.$on('jobTemplateLoaded', function (e, masterObject) {
+            $scope.jobTemplateLoadedRemove = $scope.$on('jobTemplateLoaded', function (e, mainObject) {
                 var dft;
 
-                master = masterObject;
+                main = mainObject;
 
                 dft = ($scope.host_config_key === "" || $scope.host_config_key === null) ? false : true;
                 hashSetup({
                     scope: $scope,
-                    master: master,
+                    main: main,
                     check_field: 'allow_callbacks',
                     default_val: dft
                 });
@@ -486,10 +486,10 @@ export default
                 // set initial vals for webhook checkbox
                 if (jobTemplateData.webhook_service) {
                     $scope.enable_webhook = true;
-                    master.enable_webhook = true;
+                    main.enable_webhook = true;
                 } else {
                     $scope.enable_webhook = false;
-                    master.enable_webhook = false;
+                    main.enable_webhook = false;
                 }
 
                 ParseTypeChange({
@@ -540,17 +540,17 @@ export default
                                 $scope.survey_exists = true;
                             }
                         }
-                        master[fld] = $scope[fld];
+                        main[fld] = $scope[fld];
                     }
                     if (fld === 'extra_vars') {
                         // Parse extra_vars, converting to YAML.
                         $scope.extra_vars = ParseVariableString(jobTemplateData.extra_vars);
-                        master.extra_vars = $scope.extra_vars;
+                        main.extra_vars = $scope.extra_vars;
                     }
                     if (form.fields[fld].type === 'lookup' && jobTemplateData.summary_fields[form.fields[fld].sourceModel]) {
                         $scope[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField] =
                             jobTemplateData.summary_fields[form.fields[fld].sourceModel][form.fields[fld].sourceField];
-                        master[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField] =
+                        main[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField] =
                             $scope[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField];
                     }
                     if (form.fields[fld].type === 'checkbox_group') {
@@ -565,44 +565,44 @@ export default
                 $scope.survey_enabled = jobTemplateData.survey_enabled;
 
                 $scope.ask_variables_on_launch = (jobTemplateData.ask_variables_on_launch) ? true : false;
-                master.ask_variables_on_launch = $scope.ask_variables_on_launch;
+                main.ask_variables_on_launch = $scope.ask_variables_on_launch;
 
                 $scope.ask_verbosity_on_launch = (jobTemplateData.ask_verbosity_on_launch) ? true : false;
-                master.ask_verbosity_on_launch = $scope.ask_verbosity_on_launch;
+                main.ask_verbosity_on_launch = $scope.ask_verbosity_on_launch;
 
                 $scope.ask_limit_on_launch = (jobTemplateData.ask_limit_on_launch) ? true : false;
-                master.ask_limit_on_launch = $scope.ask_limit_on_launch;
+                main.ask_limit_on_launch = $scope.ask_limit_on_launch;
 
                 $scope.ask_tags_on_launch = (jobTemplateData.ask_tags_on_launch) ? true : false;
-                master.ask_tags_on_launch = $scope.ask_tags_on_launch;
+                main.ask_tags_on_launch = $scope.ask_tags_on_launch;
 
                 $scope.ask_skip_tags_on_launch = (jobTemplateData.ask_skip_tags_on_launch) ? true : false;
-                master.ask_skip_tags_on_launch = $scope.ask_skip_tags_on_launch;
+                main.ask_skip_tags_on_launch = $scope.ask_skip_tags_on_launch;
 
                 $scope.ask_diff_mode_on_launch = (jobTemplateData.ask_diff_mode_on_launch) ? true : false;
-                master.ask_diff_mode_on_launch = $scope.ask_diff_mode_on_launch;
+                main.ask_diff_mode_on_launch = $scope.ask_diff_mode_on_launch;
 
                 $scope.ask_scm_branch_on_launch = (jobTemplateData.ask_scm_branch_on_launch) ? true : false;
-                master.ask_scm_branch_on_launch = $scope.ask_scm_branch_on_launch;
+                main.ask_scm_branch_on_launch = $scope.ask_scm_branch_on_launch;
 
                 $scope.job_tag_options = (jobTemplateData.job_tags) ? jobTemplateData.job_tags.split(',')
                     .map((i) => ({name: i, label: i, value: i})) : [];
                 $scope.job_tags = $scope.job_tag_options;
-                master.job_tags = $scope.job_tags;
+                main.job_tags = $scope.job_tags;
 
                 $scope.skip_tag_options = (jobTemplateData.skip_tags) ? jobTemplateData.skip_tags.split(',')
                     .map((i) => ({name: i, label: i, value: i})) : [];
                 $scope.skip_tags = $scope.skip_tag_options;
-                master.skip_tags = $scope.skip_tags;
+                main.skip_tags = $scope.skip_tags;
 
                 $scope.ask_job_type_on_launch = (jobTemplateData.ask_job_type_on_launch) ? true : false;
-                master.ask_job_type_on_launch = $scope.ask_job_type_on_launch;
+                main.ask_job_type_on_launch = $scope.ask_job_type_on_launch;
 
                 $scope.ask_inventory_on_launch = (jobTemplateData.ask_inventory_on_launch) ? true : false;
-                master.ask_inventory_on_launch = $scope.ask_inventory_on_launch;
+                main.ask_inventory_on_launch = $scope.ask_inventory_on_launch;
 
                 $scope.ask_credential_on_launch = (jobTemplateData.ask_credential_on_launch) ? true : false;
-                master.ask_credential_on_launch = $scope.ask_credential_on_launch;
+                main.ask_credential_on_launch = $scope.ask_credential_on_launch;
 
                 if (jobTemplateData.host_config_key) {
                     $scope.example_config_key = jobTemplateData.host_config_key;
@@ -612,7 +612,7 @@ export default
 
                 $scope.callback_url = $scope.callback_server_path + ((jobTemplateData.related.callback) ? jobTemplateData.related.callback :
                 GetBasePath('job_templates') + id + '/callback/');
-                master.callback_url = $scope.callback_url;
+                main.callback_url = $scope.callback_url;
 
                 $scope.can_edit = jobTemplateData.summary_fields.user_capabilities.edit;
 
@@ -645,7 +645,7 @@ export default
                 $q.all(multiCredentialPromises)
                     .then(() => {
                         $scope.multiCredential = multiCredential;
-                        $scope.$emit('jobTemplateLoaded', master);
+                        $scope.$emit('jobTemplateLoaded', main);
                     });
             });
 
diff --git a/awx/ui/client/src/templates/job_templates/factories/hash-setup.factory.js b/awx/ui/client/src/templates/job_templates/factories/hash-setup.factory.js
index b565e06820..f9636602f8 100644
--- a/awx/ui/client/src/templates/job_templates/factories/hash-setup.factory.js
+++ b/awx/ui/client/src/templates/job_templates/factories/hash-setup.factory.js
@@ -2,12 +2,12 @@ export default
     function hashSetup() {
         return function(params) {
             var scope = params.scope,
-                master = params.master,
+                main = params.main,
                 check_field = params.check_field,
                 default_val = params.default_val;
 
             scope[check_field] = default_val;
-            master[check_field] = default_val;
+            main[check_field] = default_val;
 
             // Original gist here: https://gist.github.com/jed/982883
             scope.genHash = function (fld) {
diff --git a/awx/ui/client/src/users/edit/users-edit.controller.js b/awx/ui/client/src/users/edit/users-edit.controller.js
index 73682dafa7..9d118c72d7 100644
--- a/awx/ui/client/src/users/edit/users-edit.controller.js
+++ b/awx/ui/client/src/users/edit/users-edit.controller.js
@@ -24,7 +24,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'UserForm', 'Rest',
 
         const { me } = models;
         var form = UserForm,
-            master = {},
+            main = {},
             id = $stateParams.user_id,
             defaultUrl = GetBasePath('users') + id,
             user_obj = resourceData.data;
@@ -50,7 +50,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'UserForm', 'Rest',
             $scope.user_id = id;
             $scope.ldap_user = (user_obj.ldap_dn !== null && user_obj.ldap_dn !== undefined && user_obj.ldap_dn !== '') ? true : false;
             $scope.not_ldap_user = !$scope.ldap_user;
-            master.ldap_user = $scope.ldap_user;
+            main.ldap_user = $scope.ldap_user;
             $scope.socialAuthUser = (user_obj.auth.length > 0) ? true : false;
             $scope.last_login = user_obj.last_login;
             $scope.external_account = user_obj.external_account;
diff --git a/awx/ui/test/e2e/tests/smoke.js b/awx/ui/test/e2e/tests/smoke.js
index 7b5271523f..7b1d7ddb34 100644
--- a/awx/ui/test/e2e/tests/smoke.js
+++ b/awx/ui/test/e2e/tests/smoke.js
@@ -10,7 +10,7 @@ const initializeData = () => {
     data.ORGANIZATION_NAME = `organization-${id}`;
     data.PROJECT_NAME = `project-${id}`;
     data.PROJECT_URL = 'https://github.com/ansible/test-playbooks';
-    data.PROJECT_BRANCH = 'master';
+    data.PROJECT_BRANCH = 'devel';
     data.PLAYBOOK_NAME = 'multivault.yml';
     data.TEMPLATE_NAME = `template-${id}`;
     data.VAULT_CREDENTIAL_NAME_1 = `credential-vault-${id}-1`;