Remove previous local changes. Version running on i08.
BLVIII-25: Second user experiment - integrate XIA XMAP
ROI plugin in Xmap uses the old version of EPICs. The field that Enable 
the Dimensions of ROI is not available in the old version and cannot be 
setup. A flag is created EnableROIPVPairSupported and is configurable 
in a xml file.
Merge branch 'gda-8.40' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-epics.git into gda-8.40