Merge pull request #1040 in CASA/casa from CAS-12434 to master
* commit '14931c42986249a02b3e0194b5965b316d5bb204':
Add VI2 support for AMueller (uvcontsub) in apply context only, eliminating need to use VI1CAl env var to force use of old (VI1) mechanisms in applycal. NB: The AMueller (uvcontsub) solve still requires VI1, and this is handled internally in the uvcontsub task and in the PL's corresponding implementation via the cb tool.
Merge pull request #995 in CASA/casa from feature/CAS-12493 to master
* commit 'c1bfaaffc8f736c1753330217c72017b6ec2c085':
Changing plotcal to use four parameter values in FringeJones tables
Tidied up FringeJones.cc
Flagged dispersive component when appropriate in FringeJones
Turned FringeJones debugging info back off
Fixed the FringeJones test for four parameters
Expand fringefit to use four parameters per correlation, making space for a dispersive term
