Merge branch 'stable-2.15'

* stable-2.15:
  Fix Eclipse project generation

Change-Id: I930deb46d0279e171f12b47e1b026b2a20fa3cea