Merge remote-tracking branch 'eclipse/6.x' into sync-6.x-to-master-merge2

- strategy: use ours
- all non-version-change commits were cherrypicked before this merge commit

Signed-off-by: David Matějček <dmatej@seznam.cz>