Merge from https://github.com/taverna/taverna-localworker-activity-ui master