Pull request #871: CAS-14371
Merge in CASA/casa6 from CAS-14371 to master
* commit '754c61a43cacd511bf7b85e7053d53082f3aeb38':
Removed the numbsubms parameter setting in importasdm after Tak's fix to the setjy code.
Use ms_p to extract MS table name instead of mssel_p to avoid an issue encountered involving MMS
Added numsubms=2 to the importasdm call to bypass the error with MMS in setjy when using usescratch=False
Pull request #869: CAS-14391
Merge in CASA/casa6 from CAS-14391 to master
* commit '40014047719f1b68325a80aca9a19607df4c5e5f':
Removed another instance checking for Python 2 code.
Removed casa5-related code. Added import inspect in parallel_task_helper Removed the use of default for a few regression scripts Removed the suite function from a few test scripts.
Fixed the local_vars variable inside the write history block.
Removed casa5-related code from tasks and helper files. Removed the code that relied on the is_CASA6 and is_python3 variables. In some files, I renamed the vars variable to local_vars to avoid issues with a builtin variable in the write history block of code.
