Merge pull request #241 in CASA/casa6 from CAS-13221 to master
* commit '3f278b87dce178f896b6ecdfd9ee5876168f81f4':
Added function mergeParaCubeResults for use when tclean is in MPI mode
calibrater was missing from imports
Commit Update for tclean test to use casatestutils. Fixed conflicts.