Merge pull request #986 in CASA/casa from CAS-12489 to master
* commit 'e7d652a635628a6f48170eebabba8653567ed205':
forgot fix to the merge, CAS-12489
prevent leak of LogIO objects in FlagAgentBase, CAS-12489
prevent leak of LogIO objects in agentflagger, CAS-12489
don't leak Records allocated by toRecord in agentflagger, CAS-12489
Merge pull request #984 in CASA/casa from bugfix/CAS-12480 to master
* commit '8d09083d94b601e57792a503f12d78280c592880':
Remove a stray line in the fringefit.xml document
Remove a stray line in the fringefit.xml document
Merge remote-tracking branch 'origin/master' into CAS-12489
fix merge conflict after CAS-12364 was merged yesterday -
simple text conflict at the top of the FlagAgentBase constructor