Merge remote-tracking branch 'upstream/master'
fix feature name in core/features/org.csstudio.core.all.feature/.project.

(cherry picked from commit 5368084bbf84019e64cb0fe5738c5789376a0259)
Merge pull request #572 from MichaelRitzert/master

Master