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
Pull request #1011: CAS-14040: fftshift has incorrect math in casacore
Merge in CASA/casa6 from CAS-14040 to master
* commit '6fbcaea397bc847c331604099531e0b20230884c':
decrease timeout to original value after casacore update
Update casacore to include fix for MCFrame performance regression (https://github.com/casacore/casacore/pull/1454)
Increase timeout for single dish Solar test CAS-14040: Fix unit tests after fix in casacore fftshift implementation CAS-14040: Fix the fftShit_p sign and use latest casacore version
