Some residual merge conflcits are the master merge to ensure the proper computation of the phase grad object was carried out in VB2CFBMap.{cc,h}. The needsNewPhaseGrad function was included in PhaseGrad.{cc,h}. In VisBufferUtil.cc changes were made to resolve some merge conflicts as suggested by K.G for the getPointingDir function.
Merge pull request #994 in CASA/casa from feature/CAS-12501 to master
* commit 'dd19f9c292aed4f9f99f4acbf7dce45da90b02cc':
Restored solmode, rmsthresh to setsolve in calibrater_cmpt.cc
Added an option (niter) to set the maximum number of iterations in the fringefit least-squares solver
Merge pull request #1017 in CASA/casa from CAS-12531 to master
* commit '93e47c6e70c0c4d86848f40938046dc37c444c3c':
don't leak ChannelAverageTVILayerFactory in ms tool iface, CAS-12531
