do not require gda.beamline.name.upper
Merge branch '8.36'