Pull request #1013: CAS-14696
Merge in CASA/casa6 from CAS-14696 to master
* commit '3c2de42b15490af1a399e615b5bad74aaeb39f6b':
second round of changes from almasw
added correlatorSoftwareVersion to CorrelatorMode and fixed some types - update follows ICT-25982 status
First round of ASDM changes related to ICT-25982
Pull request #1014: CAS-14541
Merge in CASA/casa6 from CAS-14541 to master
* commit '4d6d309a586f6c28fffd6a45e34749cb29276dbb':
Update self xml to local variable, remove unnecessary code, update dictionary key value accessing
Update runtime variable for writing to pytest xml
Generate pytest xml for tests that generate weblog
