Merge branch 'master' of https://open-bitbucket.nrao.edu/scm/casa/casa6 into CAS-13369
Conflicts:
casatools/ac/templates/setup.py.in
casatools/readme.md
casatools/scripts/gcw-pick
casatools/scripts/xml-casa
The jar file had been incremented underneath these changes