s2417: fixing merge error from master v 1.1.37
s2417: fixing merge error from master v 1.1.37

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