Merge remote-tracking branch 'upstream/3.3.x' into 3.3.x
fix feature name in core/features/org.csstudio.core.all.feature/.project.
Merge pull request #571 from MichaelRitzert/3.3.x

3.3.x