Fix failing NXDetectorAreaDetectorIntegrationTest test (code okay)
Fix failing ADPilatusTest test (code okay)
Merge branch '8.30' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-epics.git into 8.30