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