Merge pull request #519 in CASA/casa6 from CAS-13548 to master
* commit 'd2cfc53b1b8e2e3b110c7ff80169f359b1ec6834':
update almatasks version to pick up changes (CAS-13548)
point casa6 to almatasks built from branch (CAS-13548)
Merge pull request #488 in CASA/casa6 from CAS-13697 to master
* commit '7c49a09df665cdcfe06d6661eb037664fcb99bbe':
standard update of casacore for 6.5 (CAS-13697)