Pull request #761: CAS-14250
Merge in CASA/casa6 from CAS-14250 to release/6.6.1
* commit '1b99027bae7bebe9960db7dd3185848dc92b3060':
fixed unintended diffs from release/6.6.1
reverted changes that entered build.conf and setup.cfg
Added changed files from CAS-14200