Pull request #832: CAS-14171
Merge in CASA/casa6 from CAS-14171 to master
* commit '7dc0539c7526704f547cf4f6230febf1e5f5052a':
refactoring
Refactoring for readability
Fail explicitly when exception occured during eval
add warning comment on possible intermittent failure
use f.tell() to get offset position CAS-14171 add unit test for bug fix CAS-14171 sort processSpwList_ CAS-14171 sort input collection for std::set_difference
Pull request #831: CAS-13670
Merge in CASA/casa6 from CAS-13670 to master
* commit '034f2ec7ab8ae7e000e4ebe11a1a9a0f035889f3': (30 commits)
Revert "Delete workspace.xm"
Delete workspace.xm
Fix the error of the reference in the tests
Changes according to the NAOJ code review Refs #2679
Change according NAOJ code review Refs #2658, add minor fixes
Change according NAOJ code review Refs #2658, change to assertAlmostEqual
Changes according to the NAOJ code review Refs #2658
Changes according to the NAOJ code review Refs #2663
Changes according to the NAOJ code review Refs #2670
Changes according to the NAOJ code review Refs #2671
Changes according to the NAOJ code review Refs #2660
Changes according to the NAOJ code review Refs #2658
Changes according to the NAOJ code review Refs #2663
Fix message in sdbaseline_outbltableTest.test305
Add test for sinusoid fitting in variable
Changes according to the NAOJ code review Refs #2651
Changes according to the NAOJ code review Refs #2653
Changes according to the NAOJ code review Refs #2652
Changes according to the NAOJ code review Refs #2650
Changes according to the NAOJ code review Refs #2647
...
