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