Refix to http://jira.diamond.ac.uk/browse/SCI-1702
Put back old activator based start for GDA client only.