Merge branch 'stable-2.12'

* stable-2.12:
  Add 'eclipse-out' to the list of ignored folders
  Fix Eclipse project generation

Change-Id: I32545167c8fed5ba5ca8b0a7884a784a3e9f48bb