Merge pull request #942 in CASA/casa from bugfix/CAS-9842 to master
* commit 'bae771b82c550cc8a0ac22462d828c79d4e0282b': CAS-9842 Fixed wrong description of infile parameter
Merge pull request #939 in CASA/casa from CAS-12413 to master
* commit 'fbfeb12ea1886bf912331e12fd88a630ea2ebe87': CAS-12413 squash gcc compiler warnings on linux