Merge pull request #436 in CASA/casa6 from CAS-12618 to master
* commit 'a7c6e16bd0edb71e29b95c1cecb3fa176c5ff8ee':
Fixed a merge issue
Added a new method, resetSaveModelParams in imager_parallel_continuum to pass reset parameters to each node
Added unit tests test_modelvis_12 ~ test_modelvis_19
Fixed a bug for savemodel='virtual'
Added a method, resetParameters() to ImagerParameters so that the internal parameters, readonly and usescratch are reset to the proper setting for savemodel='modelcolumn' or savemodel='virtual' when predictModel is done in separate step after the deconvolution.
Added the nsgima handling in casa5 side
Added handling for the case nsigma > 0
Moving saving model step outside of interation control for automasking and interactive clean for tclean. Removed savemodel parameter from sdintimaging.
Merge pull request #445 in CASA/casa6 from CAS-13529 to master
* commit 'a49b78180860cfdfb987a0481b41b28654f14ff7':
changes for building with gcc 10 on maacos 10.15 (CAS-13529)
Merge pull request #444 in CASA/casa6 from CAS-13518 to master
* commit 'b5bbd3a7e273decf367accc4e5c0345b0477f71f': CAS-13518: tweaked some deprecated text, fixed a typo, removed some tabs CAS-13518: added deprecation warnings for useversion, showversion and updated default values for sdm tool, importasdm, exportasdm, and related tests
