Pull request #1087: CAS-14849
Merge in CASA/casa6 from CAS-14849 to master
* commit 'b7c9977a194ec0f6d5ce3a54c3a47be204959703':
casaconfig 1.5.2
casaconfig to 1.5.2.dev to address issues with failing tests
casaconfig to 1.5.1, commented out casaconfig dev info from setup.py
changes to use development casaconfig for CAS-14849 (1.5.1.dev1)
Pull request #1079: CAS-14812
Merge in CASA/casa6 from CAS-14812 to master
* commit '96f0882b20b77a5dabb50d0519fbb2fb99490292':
make minimum oversampling to be 10 for awp2 and awphpg..reduces flux difference from mosaic by a few %
Fixed a rounding to zero problem when the field of view of image is tiny wrt to beam fov
some suggestions from reviewer and removed some commented code
cherry picked stuff from CAS-14708
cherry picked fixes from CAS-14708
cherrypicking this file
