XMAP: Code tidyup and changed numberOfMCAs to numberOfElements.
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-epics.git