CAS-13818 : Fix mask cache conflict on tclean restart
As documented, the fix for the original issue triggered a mask cache
conflict on restart. In the end the fix turned out to be fairly simple -
check if the mask exists and is valid, and do not touch it if it is.
So in the first instance, when the mask does not exist, it will do the
right thing. And it will not try to do anything on the restart either.
It ended up being a simple inversion of the original logic, with
appropriate traps in place so it works for both the original bug and the
derived bug.
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
