Pull request #565: CAS-13793
Merge in CASA/casa6 from CAS-13793 to master
* commit '1e592ab5a65395418d74ec38ddab5ef33aa316b0':
Code reviewed and cleanup a few things following sourcery suggestions. Looks good.
Added more test cases from casa5 regression and fixed errors
Added new test cases adapted from casa5 test