Changes to allow for Tycho build to P2 repository