Pull request #847: CAS-14407
Merge in CASA/casa6 from CAS-14407 to master
* commit '3cfed5d4d3994d8025baeb131157f94d7847398a':
pick up trunk build of casaviewer [CAS-14407]
pick up next casaviewer build [CAS-14407]
fix casaviewer version number in build.conf [CAS-14407]
undo build test + add casaviewer changes to build [CAS-14407]
try to get bamboo to build [CAS-14407]