Pull request #865: CAS-13863
Merge in CASA/casa6 from CAS-13863 to master
* commit 'bbe7d372e537c293e32064db11eef17498ec9f4e': CAS-13863 update unittest to be consistent with the implementation CAS-13863 incorporate the update provided by Todd Hunter