GDA-6009 More changes to server start scripts