Merge branch 'v2.x/staging' into test/no-zwe

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Zowe Launcher Changelog
 
-All notable changes to the Zowe Launcher package will be documented in this file..
+All notable changes to the Zowe Launcher package will be documented in this file.
 This repo is part of the app-server Zowe Component, and the change logs here may appear on Zowe.org in that section.
 
 ## 2.13.0

samplib/ZWESLSTC

@@ -1,4 +1,4 @@
-//ZWESLSTC  PROC RGN=0M,HAINST='{{ha_instance_id}}'
+//ZWESLSTC  PROC RGN=0M,HAINST='__ha_instance_id__'
 //********************************************************************/
 //* This program and the accompanying materials are                  */
 //* made available under the terms of the                            */
@@ -22,10 +22,11 @@
 //********************************************************************/
 //ZWELNCH  EXEC PGM=ZWELNCH,REGION=&RGN,TIME=NOLIMIT,
 // PARM='ENVAR(_CEE_ENVFILE=DD:STDENV),POSIX(ON)/&HAINST.'
-//STEPLIB  DD   DSNAME=&SYSUID..LOADLIB,DISP=SHR
-//SYSIN    DD   DUMMY
-//SYSPRINT DD   SYSOUT=*,LRECL=1600
-//SYSERR   DD   SYSOUT=*
+//STEPLIB  DD  DSNAME={zowe.setup.dataset.authLoadlib},
+//             DISP=SHR
+//SYSIN    DD  DUMMY
+//SYSPRINT DD  SYSOUT=*,LRECL=1600
+//SYSERR   DD  SYSOUT=*
 //********************************************************************/
 //*
 //* CONFIG= can be either a single path ex.
@@ -57,5 +58,5 @@
 _CEE_ENVFILE_CONTINUATION=\
 _CEE_RUNOPTS=HEAPPOOLS(OFF),HEAPPOOLS64(OFF)
 _EDC_UMASK_DFLT=0002
-CONFIG=#zowe_yaml
+CONFIG={ZWE_CLI_PARAMETER_CONFIG}
 /*