Pull request #672: CAS-14021
Merge in CASA/casa6 from CAS-14021 to master
* commit 'c9fa1a9a011e1aa956c0c664e6e52a3a49820b82':
Removed unecessary logging lines
Fixed indentation error
Fix Indent error
Removed casa5 code from files
Fixed typo in formatting
Increased the tolerance for one test, to check both linux and macOS