Merge remote-tracking branch 'remotes/origin/master' into tycho_csstudio_product

Conflicts:
	applications/plugins/org.csstudio.logbook/META-INF/MANIFEST.MF
	applications/plugins/org.csstudio.scan.server/META-INF/MANIFEST.MF
	applications/plugins/org.csstudio.swt.xygraph/build.properties
	applications/plugins/org.csstudio.trends.databrowser2.opiwidget/META-INF/MANIFEST.MF
tycho build: fix depends on junit
Merge branch 'tycho_csstudio_product' of https://github.com/ControlSystemStudio/cs-studio into tycho_csstudio_product

Conflicts:
	applications/plugins/org.csstudio.logbook/META-INF/MANIFEST.MF
	applications/plugins/org.csstudio.scan.server/META-INF/MANIFEST.MF
	applications/plugins/org.csstudio.trends.databrowser2.opiwidget/META-INF/MANIFEST.MF