Updated ADPilatusTest to reflect recent change to
HardwareTriggeredPilatus CollectionStrategy
Fixed SingleImagePerFileWriterTest to reflect recent change to add
terminal output
Updated EpicsTrajectoryMoveControllerAdapterIntegrationTest to reflect
changes to EpicsTrajectoryMoveController

The change was to verify that Epics read back the correct values before
building the trajectory.
MXGDA-870 EPICS: Suppress type mismatch warnings from LazyPVs when using newBooleanFromEnumPV or newReadOnlyBooleanFromEnumPV

(cherry pick of cc945d3 from master branch)
MXGDA-870 EPICS: Add newIntegerFromEnumPV factory method to LazyPVFactory

(Type mismatch warnings are suppressed when creating a LazyPV in this way.)

(cherry pick of 719cb98 from master branch)
EPICS: send event from EpicsPositioner whenever an EPICS event is received
TESTING: Ignore test that depends on resources no longer available
MXGDA-918 put in log messages from Attenuator.py
MXGDA-968 set useCurrentEnergy when setting transmission
Merge commit '279d614'

Using strategy 'ours' - the commits below were cherry-picked from master

* commit '279d614':
  MXGDA-870 EPICS: Add newIntegerFromEnumPV factory method to LazyPVFactory
  MXGDA-870 EPICS: Suppress type mismatch warnings from LazyPVs when using newBooleanFromEnumPV or newReadOnlyBooleanFromEnumPV
Merge commit 'a4e5006'

* commit 'a4e5006':
  TESTING: Ignore test that depends on resources no longer available
  EPICS: send event from EpicsPositioner whenever an EPICS event is received
Merge branch '1.0'

* 1.0:
  MXGDA-968 set useCurrentEnergy when setting transmission
  MXGDA-918 put in log messages from Attenuator.py
Merge remote-tracking branch 'origin/1.1.mt'

Conflicts:
	uk.ac.gda.epics.test/src/gda/device/continuouscontroller/EpicsTrajectoryMoveControllerAdapterIntegrationTest.java
	uk.ac.gda.epics.test/src/gda/device/detector/addetector/ADPilatusTest.java
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-epics.git