Merge pull request #828 in CASA/casa from CAS-12188 to master
* commit 'dc322a397a07ce5b2bbc2538df7cce223a058567':
misplaced brace
add casa 6 tool version functions
Merge pull request #827 in CASA/casa from CAS-12184 to master
* commit 'a357acdaafc4a217ecacea54c394d61bed0defb1': CAS-12184 squash compiler warnings in code/atmosphere