s2016, t8035: more stuff to merge...
s2016, t8035: more stuff to merge...

hjeeves/cadc-vosui,opencadc/vosui,opencadc/cadc-vosui,hjeeves/cadc-vosui,opencadc/vosui,opencadc/cadc-vosui,opencadc/vosui,opencadc/cadc-vosui,hjeeves/cadc-vosui,opencadc/cadc-vosui,opencadc/vosui,hjeeves/cadc-vosui