Merge branch 'taverna3-osgi-launcher'