fix for local env override

Author: SaranshBS

src/main/java/com/browserstack/automate/ci/jenkins/pipeline/AppUploadStepExecution.java

@@ -42,9 +42,8 @@ protected Void run() throws Exception {
             return null;
         }
 
-        EnvVars overrides = run.getEnvironment(taskListener);
-        overrides.put(BrowserStackEnvVars.BROWSERSTACK_APP_ID, appId);
-        HashMap<String, String> overridesMap = new HashMap<>(overrides);
+        HashMap<String, String> overridesMap = new HashMap<String, String>();
+        overridesMap.put(BrowserStackEnvVars.BROWSERSTACK_APP_ID, appId);
 
         body = getContext().newBodyInvoker()
                 .withContext(EnvironmentExpander.merge(getContext().get(EnvironmentExpander.class),

src/main/java/com/browserstack/automate/ci/jenkins/pipeline/BrowserStackPipelineStepExecution.java

@@ -87,15 +87,15 @@ public boolean start() throws Exception {
                 new BrowserStackBuildWrapperOperations(credentials, false, taskListener.getLogger(),
                         localConfig, browserStackLocal);
 
-        EnvVars overrides = run.getEnvironment(taskListener);
-        HashMap<String, String> overridesMap = new HashMap<String, String>(overrides);
+        HashMap<String, String> overridesMap = new HashMap<String, String>();
         buildWrapperOperations.buildEnvVars(overridesMap);
 
         body = getContext()
                 .newBodyInvoker().withContext(credentials).withContext(EnvironmentExpander
                         .merge(getContext().get(EnvironmentExpander.class), new ExpanderImpl(overridesMap)))
                 .withCallback(new Callback(browserStackLocal)).start();
 
+        EnvVars overrides = run.getEnvironment(taskListener);
         tracker.pluginInitialized(overrides.get(Constants.JENKINS_BUILD_TAG),
                 (this.localConfig != null), true);
         return false;