Pull request #596: CAS-13673
Merge in CASA/casa6 from CAS-13673 to master
* commit '9841faa07373a849fd0db2c6b8f1a3510cd11f48':
replace _extract_blfunc_params() by a new logic suggested by Renauld
fixed typo
make each sdbaseline parameter per line
delete paramfile in tearDown()
add a comment for sorting blparam file
remove loop to simplify the code
refactor a helper function for the variableTest class
add a unit test and make some tests of bloutputTest for variable mode to be skipped tentatively
fixed the bug reported in the JIRA ticket
Pull request #595: CAS-13660
Merge in CASA/casa6 from CAS-13660 to master
* commit 'e8ddcc8a64e7289b2ee311e5ecef29888cd95213': CAS-13660: Corrected typo in new unit test case: test_task_tclean.test_cube.test_cube_wdighting_taper. CAS-13660 Added unit test case test_cube_weighting_taper to casa6/casatasks/test/tasks/test_task_tclean.py.
s for cube with natural weighting and uvtaper.