Fixes for Eclipse feature build process