Merge pull request #1066 in CASA/casa from bugfix/CAS-12433 to master
* commit '330e0761328c85061671ed83e8e7e9df8d35737c':
Fixed ..what was literally and figuratively an edge case issue !
Fix for some unit tests
Fixed some merge stuff
Revert "redo the weighting scheme for interpolation"
redo the weighting scheme for interpolation