Merge pull request #949 in CASA/casa from bugfix/CAS-12441 to release/5.5.0
* commit 'ed7c6128260254f3db8816766b7acb9ff9ee0fa1':
missed patches when transferring over from CAS-7210
more changes from CAS-7210
more files from CAS-7210
moved appropriate changes from CAS-7210 branch here