Feature and bundle changes required to build with Tycho