Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into s1661