Merge branch 'gda-8.42' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-devices-pixium.git into gda-8.42
 additional method required
Conflicts:
	uk.ac.gda.epics.client.pixium/src/uk/ac/gda/epics/client/pixium/views/PixiumView.java