Revert "Untracking workspace specific eclipse files"

This reverts commit 76abcae7d1261027a144c124d50741078e00bd86.
Merge branch 'master' into dev-stable