Merge in CASA/casa6 from CAS-13860 to master
* commit '6a3106d5759c05c1aaf809d909c6a813421b1d9a':
Revert "Revert "Update casacore to 4aff237e58d217ffe811428abe1bd32e8d76c647""
Revert "Update casacore to 4aff237e58d217ffe811428abe1bd32e8d76c647"
Update casacore to 4aff237e58d217ffe811428abe1bd32e8d76c647