Merge pull request #816 in CASA/casa from CAS-12162 to master
* commit '356c8d3a179b122444b2d3b4b1d1fbdcc2bb0594':
some updates and back outs
more elimination of compiler warnings
put declaration and initialization in openmp block
CAS-12162 eliminate some clang compiler warnings