Merge pull request #374 in CASA/casa6 from CAS-13438 to master
* commit '51107a7467a28de68bb132213152209a9016731b':
CAS-13438 : Added 1 test and modified one.
CAS-13438 : Fixed what got broken in cas-13211 and which showed up in cas-13421. Enabled 3 tests that got skipped in cas-13420 and which were waiting for cas-13421.