Merge branch 'master' of ssh://jurose@git.eclipse.org:29418/eclipsescada/org.eclipse.scada.deploy