merged to trunk, T2-847
merged to trunk, T2-847

git-svn-id: 8cc48d88192f26cc6899727a33f23ad31b30988e@10056 bf327186-88b3-11dd-a302-d386e5130c1c

apache/incubator-taverna-engine,apache/incubator-taverna-engine