Merge pull request #242 in CASA/casa from bugfix/CAS-10646 to release/5.1.0
* commit '7cb7e30a9a2b2c1db007cade0251202008259fd7': CAS-10646 : Duplicate of CAS-10264 for the 5.1 branch
Merge pull request #240 in CASA/casa from bugfix/CAS-10633 to release/5.1.0
* commit '39cbc430c48e19220c2ad29cab2b40560fc4c15e':
Fixes of CAS-10603 for 5.1 with the exeception of conjbeams is set to False as default in tclean